commit e630c3c5073e0f650c57355f995e5e10464c18c0
author Rico Wind <ricow@google.com> Tue Jan 04 16:39:14 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 04 16:39:14 2022 +0000
tree cb9524de184be21842ebeb97089b008648eba92b
parent d1cea9ae43bdd8da720e699858f88fa24a333756
parent 9eb67633322786124fa5e415237fcd29dfa272f8

Update D8 and R8 to 3.3.4-dev am: 78a4d7cb9e am: dd277115c4 am: 0cfdcd67d3 am: 9eb6763332

Original change: https://android-review.googlesource.com/c/platform/prebuilts/r8/+/1933147

Change-Id: Ib1b1f21991b3312e0ab9e941a0896f98b86f076d

r8.jar

diff --git a/r8.jar b/r8.jar
index a3b6130..62fe89d 100644
--- a/r8.jar
+++ b/r8.jar
Binary files differ

r8.jar.map

diff --git a/r8.jar.map b/r8.jar.map
index b6ee4cb..c0368c7 100644
--- a/r8.jar.map
+++ b/r8.jar.map
@@ -1,10 +1,10 @@
 # compiler: R8
-# compiler_version: 3.3.3-dev
+# compiler_version: 3.3.4-dev
 # compiler_hash: engineering
 # common_typos_disable
 # {"id":"com.android.tools.r8.mapping","version":"2.0"}
-# pg_map_id: 3.3.3-dev
-# pg_map_hash: SHA-256 b6cbc658912fa57621f2229a036e000129454846d91cecb9afceb629d70a90f8
+# pg_map_id: 3.3.4-dev
+# pg_map_hash: SHA-256 7b857942d4cf80424bcd3939a8f7b318b35e6c8273a4d815583db313f5ade73e
 com.android.tools.r8.ApiLevelException -> com.android.tools.r8.internal.g2:
     boolean $assertionsDisabled -> d
     1:1:void <clinit>():10:10 -> <clinit>
@@ -772,12 +772,12 @@
     658:658:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266:266 -> d
     659:664:com.android.tools.r8.naming.NamingLens com.android.tools.r8.naming.RecordRewritingNamingLens.createRecordRewritingNamingLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):25:30 -> d
     659:664:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):266 -> d
-    665:665:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> d
+    665:665:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> d
     665:665:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):268 -> d
     666:666:void finalizeApplication(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService,com.android.tools.r8.naming.NamingLens):340:340 -> d
     666:666:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):269 -> d
     667:667:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):270:270 -> d
-    668:668:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():489:489 -> d
+    668:668:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> d
     668:668:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271 -> d
     669:690:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):271:292 -> d
     691:703:void run(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):286:298 -> d
@@ -825,7 +825,7 @@
     30:40:void <init>(boolean,boolean):435:445 -> <init>
     1:1:com.android.tools.r8.D8Command$Builder builder(com.android.tools.r8.utils.AndroidApp):349:349 -> a
     1:4:com.android.tools.r8.utils.InternalOptions getInternalOptions():450:453 -> b
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     5:5:com.android.tools.r8.utils.InternalOptions getInternalOptions():454 -> b
     6:14:com.android.tools.r8.utils.InternalOptions getInternalOptions():455:463 -> b
     15:73:com.android.tools.r8.utils.InternalOptions getInternalOptions():462:520 -> b
@@ -2236,7 +2236,7 @@
     67:67:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     68:70:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):147:149 -> a
     68:70:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
-    71:71:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():489:489 -> a
+    71:71:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> a
     71:71:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150 -> a
     71:71:void lambda$run$0(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp,java.util.concurrent.ExecutorService):107 -> a
     72:80:void desugar(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions,java.util.concurrent.ExecutorService):150:158 -> a
@@ -2462,10 +2462,10 @@
     boolean lambda$run$3(com.android.tools.r8.graph.DexType) -> a
     com.android.tools.r8.graph.DexApplication lambda$run$8(com.android.tools.r8.graph.DexApplication,com.android.tools.r8.graph.DexApplication) -> a
     1:8:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):220:227 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     9:9:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):228 -> a
     10:10:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):229:229 -> a
-    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():489:489 -> a
+    11:11:com.android.tools.r8.ClassFileConsumer com.android.tools.r8.utils.InternalOptions.getClassFileConsumer():492:492 -> a
     11:11:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):230 -> a
     12:24:void writeApplication(java.util.concurrent.ExecutorService,com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens,com.android.tools.r8.graph.InitClassLens,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.utils.AndroidApp):230:242 -> a
     25:26:void runForTesting(com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.utils.InternalOptions):248:249 -> a
@@ -2680,7 +2680,7 @@
     89:91:com.android.tools.r8.StringConsumer wrapStringConsumer(com.android.tools.r8.StringConsumer,boolean,java.nio.file.Path):971:973 -> b
     89:91:com.android.tools.r8.utils.InternalOptions getInternalOptions():900 -> b
     92:119:com.android.tools.r8.utils.InternalOptions getInternalOptions():900:927 -> b
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     120:120:com.android.tools.r8.utils.InternalOptions getInternalOptions():932 -> b
     121:142:com.android.tools.r8.utils.InternalOptions getInternalOptions():933:954 -> b
     143:151:com.android.tools.r8.utils.InternalOptions getInternalOptions():953:961 -> b
@@ -2776,7 +2776,7 @@
     5:10:com.android.tools.r8.com.google.common.collect.ImmutableList com.android.tools.r8.shaking.ProguardConfigurationParser.parse(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):113:118 -> r
     5:10:com.android.tools.r8.R8Command makeR8Command():476 -> r
     11:20:com.android.tools.r8.R8Command makeR8Command():479:488 -> r
-    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():775:775 -> r
+    21:21:boolean com.android.tools.r8.utils.InternalOptions.shouldEnableKeepRuleSynthesisForRecompilation():778:778 -> r
     21:21:com.android.tools.r8.R8Command makeR8Command():488 -> r
     22:88:com.android.tools.r8.R8Command makeR8Command():489:555 -> r
     89:89:com.android.tools.r8.utils.InternalOptions$DesugarState com.android.tools.r8.BaseCompilerCommand$Builder.getDesugaringState():534:534 -> r
@@ -3291,110 +3291,98 @@
     com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibraryConfiguration -> e
     boolean $assertionsDisabled -> f
     com.android.tools.r8.androidapi.AndroidApiLevelCompute apiLevelCompute -> d
-    1:1:void <clinit>():37:37 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.graph.AppView):123:123 -> <init>
-    2:11:void <init>(com.android.tools.r8.graph.AppView):117:126 -> <init>
-    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.androidapi.ApiReferenceStubber):37:37 -> a
-    2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType):37:37 -> a
-    3:3:void access$200(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexMethod):37:37 -> a
-    4:4:void run(java.util.concurrent.ExecutorService):130:130 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    5:5:void run(java.util.concurrent.ExecutorService):130 -> a
+    1:1:void <clinit>():38:38 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.graph.AppView):117:117 -> <init>
+    2:11:void <init>(com.android.tools.r8.graph.AppView):111:120 -> <init>
+    1:1:com.android.tools.r8.graph.AppView access$000(com.android.tools.r8.androidapi.ApiReferenceStubber):38:38 -> a
+    2:2:void access$100(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexType):38:38 -> a
+    3:3:void access$200(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.DexMethod):38:38 -> a
+    4:4:void run(java.util.concurrent.ExecutorService):124:124 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    5:5:void run(java.util.concurrent.ExecutorService):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:22:void run(java.util.concurrent.ExecutorService):130:146 -> a
+    6:22:void run(java.util.concurrent.ExecutorService):124:140 -> a
     23:23:boolean com.android.tools.r8.graph.AppView.hasLiveness():659:659 -> a
-    23:23:void run(java.util.concurrent.ExecutorService):146 -> a
+    23:23:void run(java.util.concurrent.ExecutorService):140 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    24:26:void run(java.util.concurrent.ExecutorService):147:149 -> a
-    27:32:void run(java.util.concurrent.ExecutorService):148:153 -> a
-    33:37:void lambda$run$0(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):140:140 -> a
-    38:39:void processClass(com.android.tools.r8.graph.DexProgramClass):158:159 -> a
-    40:40:void lambda$processClass$1(com.android.tools.r8.graph.ProgramMethod):161:161 -> a
-    41:45:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):165:169 -> a
-    46:46:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":235,"2":236,"3":237}}
-    235:235:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169:169 -> a
-    236:236:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    236:236:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169 -> a
-    237:237:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    237:237:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169 -> a
-    216:216:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):170:170 -> a
-    217:217:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    217:217:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):171 -> a
-    218:219:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):174:175 -> a
-    220:220:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
-    220:220:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):175 -> a
-    221:223:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):175:177 -> a
+    24:26:void run(java.util.concurrent.ExecutorService):141:143 -> a
+    27:32:void run(java.util.concurrent.ExecutorService):142:147 -> a
+    33:37:void lambda$run$0(com.android.tools.r8.graph.DexLibraryClass,java.util.Set):134:134 -> a
+    38:44:void processClass(com.android.tools.r8.graph.DexProgramClass):152:158 -> a
+    45:45:void lambda$processClass$1(com.android.tools.r8.graph.ProgramMethod):160:160 -> a
+    46:50:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):164:168 -> a
+    51:51:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":239,"2":240,"3":241}}
+    239:239:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168:168 -> a
+    240:240:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    240:240:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168 -> a
+    241:241:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    241:241:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):168 -> a
+    220:220:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):169:169 -> a
+    221:221:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    221:221:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):170 -> a
+    222:223:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):173:174 -> a
     224:224:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
-    224:224:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):179 -> a
-    225:234:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):178:187 -> a
-    238:243:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):193:198 -> a
-    244:244:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
-    244:244:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):202 -> a
-    245:247:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):203:205 -> a
-    248:248:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
-    248:248:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):205 -> a
-    249:254:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):204:209 -> a
-    255:259:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):208:212 -> a
-    260:260:java.util.Set lambda$findReferencedLibraryClasses$3(com.android.tools.r8.graph.DexLibraryClass):209:209 -> a
-    261:275:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):220:234 -> a
-    276:276:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):230:230 -> a
-    277:281:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):237:241 -> a
-    282:282:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):240:240 -> a
-    283:288:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):239:244 -> a
-    289:289:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
-    289:289:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):246 -> a
-    290:297:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):247:254 -> a
-    298:298:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):253:253 -> a
-    299:306:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):252:259 -> a
-    307:307:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2381:2381 -> a
-    307:307:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):259 -> a
+    224:224:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):174 -> a
+    225:227:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):174:176 -> a
+    228:228:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    228:228:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):178 -> a
+    229:238:void findReferencedLibraryMethod(com.android.tools.r8.graph.DexMethod):177:186 -> a
+    242:247:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):192:197 -> a
+    248:248:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
+    248:248:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):201 -> a
+    249:251:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):202:204 -> a
+    252:252:com.android.tools.r8.androidapi.ComputedApiLevel$UnknownApiLevel com.android.tools.r8.androidapi.ComputedApiLevel.unknown():22:22 -> a
+    252:252:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):204 -> a
+    253:258:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):203:208 -> a
+    259:263:void findReferencedLibraryClasses(com.android.tools.r8.graph.DexType):207:211 -> a
+    264:264:java.util.Set lambda$findReferencedLibraryClasses$3(com.android.tools.r8.graph.DexLibraryClass):208:208 -> a
+    265:279:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):219:233 -> a
+    280:280:void mockMissingLibraryClass(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode):229:229 -> a
+    281:285:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):236:240 -> a
+    286:286:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):239:239 -> a
+    287:292:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):238:243 -> a
+    293:293:boolean com.android.tools.r8.graph.DexClass.isFinal():656:656 -> a
+    293:293:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):245 -> a
+    294:301:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):246:253 -> a
+    302:302:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):252:252 -> a
+    303:310:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):251:258 -> a
+    311:311:com.android.tools.r8.graph.DexMethod com.android.tools.r8.graph.DexItemFactory.createClassInitializer(com.android.tools.r8.graph.DexType):2381:2381 -> a
+    311:311:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    308:308:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):258:258 -> a
-    309:309:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
-    309:309:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):260 -> a
-    310:312:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):260:262 -> a
-    313:320:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):256:263 -> a
-    321:322:java.util.List buildLibraryMethodsForProgram(com.android.tools.r8.graph.DexLibraryClass,java.lang.Iterable,java.util.Set):269:270 -> a
-    323:326:void lambda$buildLibraryMethodsForProgram$5(java.util.Set,com.android.tools.r8.graph.DexLibraryClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):272:275 -> a
-    327:330:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):284:284 -> a
-    333:340:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):287:294 -> a
-    341:344:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):293:296 -> a
-    345:345:void lambda$buildLibraryMethodForProgram$6(com.android.tools.r8.graph.DexEncodedMethod$Builder):292:292 -> a
-    1:1:java.util.Set lambda$findReferencedLibraryMethod$2(com.android.tools.r8.graph.DexLibraryClass):186:186 -> b
-    2:2:void lambda$buildLibraryMethodForProgram$7(com.android.tools.r8.graph.DexEncodedMethod$Builder):295:295 -> b
+    312:312:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):257:257 -> a
+    313:313:com.android.tools.r8.graph.MethodAccessFlags com.android.tools.r8.graph.MethodAccessFlags.createForClassInitializer():79:79 -> a
+    313:313:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):259 -> a
+    314:316:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):259:261 -> a
+    317:324:void lambda$mockMissingLibraryClass$4(com.android.tools.r8.graph.DexLibraryClass,java.util.Set,com.android.tools.r8.graph.ThrowExceptionCode,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):255:262 -> a
+    325:326:java.util.List buildLibraryMethodsForProgram(com.android.tools.r8.graph.DexLibraryClass,java.lang.Iterable,java.util.Set):268:269 -> a
+    327:330:void lambda$buildLibraryMethodsForProgram$5(java.util.Set,com.android.tools.r8.graph.DexLibraryClass,java.util.List,com.android.tools.r8.graph.DexEncodedMethod):271:274 -> a
+    331:334:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):283:283 -> a
+    337:352:com.android.tools.r8.graph.DexEncodedMethod buildLibraryMethodForProgram(com.android.tools.r8.graph.DexLibraryClass,com.android.tools.r8.graph.DexEncodedMethod):286:301 -> a
+    1:1:java.util.Set lambda$findReferencedLibraryMethod$2(com.android.tools.r8.graph.DexLibraryClass):185:185 -> b
 com.android.tools.r8.androidapi.ApiReferenceStubber$ReferencesToApiLevelUseRegistry -> com.android.tools.r8.internal.j2:
     com.android.tools.r8.androidapi.ApiReferenceStubber this$0 -> e
-    1:2:void <init>(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.ProgramMethod):41:42 -> <init>
-    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):57:57 -> a
-    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):77:77 -> a
-    3:10:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):101:108 -> a
-    11:11:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":123,"2":124,"3":125}}
-    123:123:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108:108 -> a
-    124:124:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    124:124:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108 -> a
-    125:125:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
-    125:125:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):108 -> a
-    120:122:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):109:111 -> a
-    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):47:47 -> b
-    2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):67:67 -> b
-    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):82:82 -> c
-    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):62:62 -> d
-    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):87:87 -> e
-    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):72:72 -> f
-    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):97:97 -> f
-    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):52:52 -> g
-    2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):92:92 -> g
-    3:3:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
-    4:4:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):0:0 -> g
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":111,"2":112,"3":113}}
-    111:111:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
-    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> g
-    112:112:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106 -> g
-    113:113:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> g
-    113:113:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106 -> g
-    110:110:void lambda$checkReferenceToLibraryClass$0(com.android.tools.r8.graph.DexType):106:106 -> g
+    1:2:void <init>(com.android.tools.r8.androidapi.ApiReferenceStubber,com.android.tools.r8.graph.ProgramMethod):42:43 -> <init>
+    1:1:void registerInvokeDirect(com.android.tools.r8.graph.DexMethod):58:58 -> a
+    2:2:void registerInstanceFieldRead(com.android.tools.r8.graph.DexField):78:78 -> a
+    3:3:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102:102 -> a
+    4:4:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":110,"2":111,"3":112}}
+    110:110:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102:102 -> a
+    111:111:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    111:111:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102 -> a
+    112:112:com.android.tools.r8.graph.DexType com.android.tools.r8.graph.GraphLens.lookupType(com.android.tools.r8.graph.DexType):393:393 -> a
+    112:112:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):102 -> a
+    107:109:void checkReferenceToLibraryClass(com.android.tools.r8.graph.DexReference):103:105 -> a
+    1:1:void registerInitClass(com.android.tools.r8.graph.DexType):48:48 -> b
+    2:2:void registerInvokeInterface(com.android.tools.r8.graph.DexMethod):68:68 -> b
+    1:1:void registerInstanceFieldWrite(com.android.tools.r8.graph.DexField):83:83 -> c
+    1:1:void registerInvokeStatic(com.android.tools.r8.graph.DexMethod):63:63 -> d
+    1:1:void registerStaticFieldRead(com.android.tools.r8.graph.DexField):88:88 -> e
+    1:1:void registerInvokeSuper(com.android.tools.r8.graph.DexMethod):73:73 -> f
+    2:2:void registerTypeReference(com.android.tools.r8.graph.DexType):98:98 -> f
+    1:1:void registerInvokeVirtual(com.android.tools.r8.graph.DexMethod):53:53 -> g
+    2:2:void registerStaticFieldWrite(com.android.tools.r8.graph.DexField):93:93 -> g
 com.android.tools.r8.androidapi.AvailableApiExceptions -> com.android.tools.r8.internal.W3:
     java.util.Set exceptions -> a
     boolean $assertionsDisabled -> b
@@ -19127,25 +19115,26 @@
 com.android.tools.r8.compatproguard.CompatProguard$CompatProguardOptions$1 -> com.android.tools.r8.compatproguard.a:
     1:1:void <init>():83:83 -> <init>
 com.android.tools.r8.contexts.CompilationContext -> com.android.tools.r8.internal.Kc:
-    java.util.Map seenSetForTesting -> b
+    java.util.Map seenSetForTesting -> c
+    java.lang.Thread mainThread -> b
     java.util.function.Consumer testingConsumer -> a
-    int nextProcessorId -> c
-    boolean $assertionsDisabled -> d
+    boolean $assertionsDisabled -> e
+    int nextProcessorId -> d
     1:1:void <clinit>():14:14 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):40:40 -> <init>
-    2:6:void <init>(com.android.tools.r8.utils.InternalOptions):37:41 -> <init>
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions):41:41 -> <init>
+    2:7:void <init>(com.android.tools.r8.utils.InternalOptions):38:43 -> <init>
     1:1:boolean access$200(com.android.tools.r8.contexts.CompilationContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):14:14 -> a
     2:2:com.android.tools.r8.contexts.CompilationContext createInitialContext(com.android.tools.r8.utils.InternalOptions):33:33 -> a
-    3:9:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):45:51 -> a
+    3:9:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):47:53 -> a
     10:10:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":62,"2":63,"3":64,"4":65,"5":66}}
-    62:62:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    63:63:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    64:64:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    65:65:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    66:66:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    61:61:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):51:51 -> a
-    67:68:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():64:65 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":64,"2":65,"3":66,"4":67,"5":68}}
+    64:64:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    65:65:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    66:66:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    67:67:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    68:68:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    63:63:boolean verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):53:53 -> a
+    69:71:com.android.tools.r8.contexts.CompilationContext$ProcessorContext createProcessorContext():66:68 -> a
 com.android.tools.r8.contexts.CompilationContext$1 -> com.android.tools.r8.internal.Fc:
 com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider -> com.android.tools.r8.internal.Gc:
     1:1:void <init>():17:17 -> <init>
@@ -19157,63 +19146,63 @@
     int nextId -> c
     com.android.tools.r8.contexts.CompilationContext$ProcessorContext parent -> a
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():112:112 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$1):112:112 -> <init>
-    2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod):117:117 -> <init>
-    3:7:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod):115:119 -> <init>
-    1:2:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():130:131 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getClassContext():136:136 -> a
-    3:3:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):153 -> a
-    4:5:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):153:154 -> a
-    6:8:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):145:147 -> a
-    6:8:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):154 -> a
-    1:1:com.android.tools.r8.graph.DexProgramClass getClassContext():136:136 -> b
-    2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):159:159 -> b
-    3:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):145:147 -> b
-    3:5:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):159 -> b
+    1:1:void <clinit>():115:115 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$1):115:115 -> <init>
+    2:2:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod):120:120 -> <init>
+    3:7:void <init>(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod):118:122 -> <init>
+    1:2:com.android.tools.r8.contexts.CompilationContext$UniqueContext createUniqueContext():133:134 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.getClassContext():139:139 -> a
+    3:3:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):156 -> a
+    4:5:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):156:157 -> a
+    6:8:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):148:150 -> a
+    6:8:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):157 -> a
+    1:1:com.android.tools.r8.graph.DexProgramClass getClassContext():139:139 -> b
+    2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):162:162 -> b
+    3:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext.buildSuffix(java.lang.StringBuilder):148:150 -> b
+    3:5:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):162 -> b
 com.android.tools.r8.contexts.CompilationContext$ProcessorContext -> com.android.tools.r8.internal.Ic:
     com.android.tools.r8.contexts.CompilationContext parent -> a
     int processorId -> b
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():69:69 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext,int,com.android.tools.r8.contexts.CompilationContext$1):69:69 -> <init>
-    2:4:void <init>(com.android.tools.r8.contexts.CompilationContext,int):73:75 -> <init>
-    1:1:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):69:69 -> a
-    2:2:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):79:79 -> a
-    2:2:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):69 -> a
-    3:4:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):91:92 -> a
-    5:5:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):79:79 -> a
-    5:5:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):92 -> a
-    6:6:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):97:97 -> a
-    6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):102 -> a
-    1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):97:97 -> b
-    1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):107 -> b
+    1:1:void <clinit>():72:72 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext,int,com.android.tools.r8.contexts.CompilationContext$1):72:72 -> <init>
+    2:4:void <init>(com.android.tools.r8.contexts.CompilationContext,int):76:78 -> <init>
+    1:1:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72:72 -> a
+    2:2:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
+    2:2:boolean access$500(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):72 -> a
+    3:4:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):94:95 -> a
+    5:5:boolean com.android.tools.r8.contexts.CompilationContext$ProcessorContext.verifyContext(com.android.tools.r8.contexts.CompilationContext$ContextDescriptorProvider):82:82 -> a
+    5:5:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext createMethodProcessingContext(com.android.tools.r8.graph.ProgramMethod):95 -> a
+    6:6:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> a
+    6:6:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):105 -> a
+    1:1:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$ProcessorContext.buildSuffix(java.lang.StringBuilder):100:100 -> b
+    1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):110 -> b
 com.android.tools.r8.contexts.CompilationContext$UniqueContext -> com.android.tools.r8.internal.Jc:
     com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext parent -> a
     int positionId -> b
-    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int,com.android.tools.r8.contexts.CompilationContext$1):163:163 -> <init>
-    2:4:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int):167:169 -> <init>
-    1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):178:178 -> a
-    2:2:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):173:173 -> a
-    2:2:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):178 -> a
-    3:3:com.android.tools.r8.graph.DexProgramClass getClassContext():187:187 -> a
-    1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):183:183 -> b
-    2:2:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):173:173 -> b
-    2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):183 -> b
-    3:3:java.lang.String getSyntheticSuffix():191:191 -> b
-    4:4:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):183:183 -> b
-    4:4:java.lang.String getSyntheticSuffix():191 -> b
-    5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):173:173 -> b
-    5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):183 -> b
-    5:5:java.lang.String getSyntheticSuffix():191 -> b
-    6:6:java.lang.String getSyntheticSuffix():191:191 -> b
+    1:1:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int,com.android.tools.r8.contexts.CompilationContext$1):166:166 -> <init>
+    2:4:void <init>(com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,int):170:172 -> <init>
+    1:1:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):181:181 -> a
+    2:2:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):176:176 -> a
+    2:2:java.lang.StringBuilder buildContextDescriptorForTesting(java.lang.StringBuilder):181 -> a
+    3:3:com.android.tools.r8.graph.DexProgramClass getClassContext():190:190 -> a
+    1:1:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):186:186 -> b
+    2:2:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):176:176 -> b
+    2:2:java.lang.StringBuilder buildSyntheticSuffix(java.lang.StringBuilder):186 -> b
+    3:3:java.lang.String getSyntheticSuffix():194:194 -> b
+    4:4:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):186:186 -> b
+    4:4:java.lang.String getSyntheticSuffix():194 -> b
+    5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSuffix(java.lang.StringBuilder):176:176 -> b
+    5:5:java.lang.StringBuilder com.android.tools.r8.contexts.CompilationContext$UniqueContext.buildSyntheticSuffix(java.lang.StringBuilder):186 -> b
+    5:5:java.lang.String getSyntheticSuffix():194 -> b
+    6:6:java.lang.String getSyntheticSuffix():194:194 -> b
 com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator -> com.android.tools.r8.internal.Lf:
     com.android.tools.r8.utils.InternalOptions options -> b
     com.android.tools.r8.naming.NamingLens namingLens -> a
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):53:56 -> <init>
     1:1:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
     1:1:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     2:2:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68 -> a
     2:2:void runIfNecessary(com.android.tools.r8.utils.Timing):60 -> a
     3:3:boolean com.android.tools.r8.desugar.desugaredlibrary.DesugaredLibraryKeepRuleGenerator.shouldRun():68:68 -> a
@@ -19422,11 +19411,11 @@
     317:317:void lambda$rewriteSourceFile$4(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProgramClass):440 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     318:318:java.util.List distribute(java.util.concurrent.ExecutorService):194:194 -> a
-    319:319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> a
+    319:319:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> a
     319:319:java.util.List distribute(java.util.concurrent.ExecutorService):194 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     320:320:java.util.List distribute(java.util.concurrent.ExecutorService):195:195 -> a
-    321:321:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():485:485 -> a
+    321:321:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():488:488 -> a
     321:321:java.util.List distribute(java.util.concurrent.ExecutorService):196 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     322:331:java.util.List distribute(java.util.concurrent.ExecutorService):196:205 -> a
@@ -19465,7 +19454,7 @@
     446:446:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):307 -> a
     447:449:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):308:308 -> a
     454:481:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):313:340 -> a
-    482:482:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    482:482:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     482:482:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     483:491:void write(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.AndroidApp):340:348 -> a
@@ -19574,12 +19563,12 @@
     329:329:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):328:328 -> b
     330:340:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):461:471 -> b
     330:340:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    341:341:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():485:485 -> b
+    341:341:com.android.tools.r8.DexFilePerClassFileConsumer com.android.tools.r8.utils.InternalOptions.getDexFilePerClassFileConsumer():488:488 -> b
     341:341:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):471 -> b
     341:341:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
     342:348:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):474:480 -> b
     342:348:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
-    349:349:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():481:481 -> b
+    349:349:com.android.tools.r8.DexIndexedConsumer com.android.tools.r8.utils.InternalOptions.getDexIndexedConsumer():484:484 -> b
     349:349:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):480 -> b
     349:349:com.android.tools.r8.utils.Timing lambda$write$3(java.util.List,com.android.tools.r8.dex.VirtualFile):329 -> b
     350:355:void com.android.tools.r8.dex.ApplicationWriter.writeVirtualFile(com.android.tools.r8.dex.VirtualFile,com.android.tools.r8.utils.Timing,java.util.List):485:490 -> b
@@ -19694,7 +19683,7 @@
     void recordHierarchyOf(com.android.tools.r8.graph.DexProgramClass) -> a
     void recordMethod(com.android.tools.r8.graph.DexMethod) -> a
     1:2:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):27:28 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     3:3:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:8:com.android.tools.r8.dex.CodeToKeep createCodeToKeep(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.naming.NamingLens):29:33 -> a
@@ -23802,7 +23791,7 @@
     94:94:void lambda$rewriteWithLens$1(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DirectMappedDexApplication,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):810:810 -> a
     95:97:com.android.tools.r8.utils.OptionalBool isSubtype(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):672:674 -> a
     98:98:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678:678 -> a
-    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    99:99:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     99:99:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):678 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     100:104:boolean isCfByteCodePassThrough(com.android.tools.r8.graph.DexEncodedMethod):681:685 -> a
@@ -23849,7 +23838,7 @@
     9:9:com.android.tools.r8.graph.DexClass definitionFor(com.android.tools.r8.graph.DexType):309:309 -> c
     10:11:java.lang.Object withProtoShrinker(java.util.function.Function,java.lang.Object):377:378 -> c
     12:12:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384:384 -> c
-    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1561:1561 -> c
+    13:13:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1564:1564 -> c
     13:13:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):384 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     14:14:java.lang.Object withProtoEnumShrinker(java.util.function.Function,java.lang.Object):385:385 -> c
@@ -24766,6 +24755,7 @@
     1:1:com.android.tools.r8.graph.DexWritableCode$DexWritableCodeKind getDexWritableCodeKind():204:204 -> m
     1:1:com.android.tools.r8.graph.DexCode$Try[] getTries():255:255 -> p
     com.android.tools.r8.graph.Code asCode() -> q
+    1:1:com.android.tools.r8.graph.DefaultInstanceInitializerCode get():63:63 -> s0
     1:1:java.lang.String toString():377:377 -> toString
     1:1:com.android.tools.r8.graph.DexCode$TryHandler[] getHandlers():214:214 -> v
     com.android.tools.r8.graph.DexString getHighestSortingString() -> x
@@ -26735,7 +26725,7 @@
     789:789:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472 -> a
     790:791:boolean willBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):464:465 -> a
     790:791:boolean isOrWillBeInlinedIntoInstanceInitializer(com.android.tools.r8.graph.DexItemFactory):472 -> a
-    792:792:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    792:792:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     792:792:com.android.tools.r8.graph.Code buildInstanceOfCode(com.android.tools.r8.graph.DexType,boolean,com.android.tools.r8.utils.InternalOptions):945 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     793:806:com.android.tools.r8.graph.CfCode buildInstanceOfCfCode(com.android.tools.r8.graph.DexType,boolean):951:964 -> a
@@ -26855,7 +26845,7 @@
     4419:4419:com.android.tools.r8.graph.DexEncodedMethod$Builder builder(com.android.tools.r8.graph.DexEncodedMethod):1335:1335 -> a
     4419:4419:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):980 -> a
     4420:4420:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982:982 -> a
-    4421:4421:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4421:4421:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     4421:4421:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):982 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4422:4422:com.android.tools.r8.graph.DexEncodedMethod toMethodThatLogsError(com.android.tools.r8.graph.AppView):983:983 -> a
@@ -27184,8 +27174,8 @@
     1:1:com.android.tools.r8.graph.DexType getType():70:70 -> getType
     boolean isDexField() -> k0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():66:66 -> n
-    1:1:java.lang.Iterable getReferencedTypes():171:171 -> q0
-    1:5:com.android.tools.r8.references.FieldReference asFieldReference():217:217 -> r0
+    1:1:java.lang.Iterable getReferencedTypes():171:171 -> p0
+    1:5:com.android.tools.r8.references.FieldReference asFieldReference():217:217 -> q0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":144,"2":145,"3":146}}
     144:144:java.lang.String toString():142:142 -> toString
@@ -28135,10 +28125,9 @@
     1:1:java.lang.Iterable getReferencedBaseTypes(com.android.tools.r8.graph.DexItemFactory):61:61 -> a
     2:2:com.android.tools.r8.graph.DexType lambda$getReferencedBaseTypes$0(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexType):61:61 -> a
     com.android.tools.r8.graph.DexMember asDexMember() -> h0
-    boolean isDexMember() -> l0
-    1:1:com.android.tools.r8.graph.DexType getHolderType():41:41 -> o0
-    1:1:com.android.tools.r8.graph.DexString getName():45:45 -> p0
-    java.lang.Iterable getReferencedTypes() -> q0
+    1:1:com.android.tools.r8.graph.DexType getHolderType():41:41 -> n0
+    1:1:com.android.tools.r8.graph.DexString getName():45:45 -> o0
+    java.lang.Iterable getReferencedTypes() -> p0
     1:1:com.android.tools.r8.graph.DexType getContextType():37:37 -> y
 com.android.tools.r8.graph.DexMemberAnnotation -> com.android.tools.r8.graph.Q0:
     com.android.tools.r8.graph.DexItem annotations -> b
@@ -28239,32 +28228,32 @@
     1:5:boolean computeEquals(java.lang.Object):223:227 -> g
     1:1:com.android.tools.r8.graph.DexType getParameter(int):86:86 -> i
     com.android.tools.r8.graph.DexMethod asDexMethod() -> i0
-    boolean isDexMethod() -> m0
+    boolean isDexMethod() -> l0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():51:51 -> n
-    1:1:java.lang.Iterable getReferencedTypes():213:213 -> q0
-    2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> q0
-    2:2:java.lang.Iterable getReferencedTypes():213 -> q0
+    1:1:java.lang.Iterable getReferencedTypes():213:213 -> p0
+    2:2:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74:74 -> p0
+    2:2:java.lang.Iterable getReferencedTypes():213 -> p0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> q0
-    3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> q0
-    3:3:java.lang.Iterable getReferencedTypes():213 -> q0
+    3:3:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> p0
+    3:3:java.lang.Iterable com.android.tools.r8.graph.DexProto.getTypes():74 -> p0
+    3:3:java.lang.Iterable getReferencedTypes():213 -> p0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    1:12:com.android.tools.r8.references.MethodReference asMethodReference():152:163 -> r0
-    13:13:com.android.tools.r8.references.MethodReference asMethodReference():161:161 -> r0
-    1:1:int getArity():169:169 -> s0
-    1:1:com.android.tools.r8.graph.DexTypeList getParameters():90:90 -> t0
+    1:12:com.android.tools.r8.references.MethodReference asMethodReference():152:163 -> q0
+    13:13:com.android.tools.r8.references.MethodReference asMethodReference():161:161 -> q0
+    1:1:int getArity():169:169 -> r0
+    1:1:com.android.tools.r8.graph.DexTypeList getParameters():90:90 -> s0
+    1:1:com.android.tools.r8.graph.DexProto getProto():94:94 -> t0
     1:1:java.lang.String toString():0:0 -> toString
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":150,"2":151,"3":152}}
     150:150:java.lang.String toString():148:148 -> toString
     151:151:java.lang.String toString():148:148 -> toString
     152:152:java.lang.String toString():148:148 -> toString
     149:149:java.lang.String toString():148:148 -> toString
-    1:1:com.android.tools.r8.graph.DexProto getProto():94:94 -> u0
-    1:1:com.android.tools.r8.graph.DexType getReturnType():98:98 -> v0
-    1:1:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> w0
-    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():173 -> w0
-    1:1:java.lang.String qualifiedName():251:251 -> x0
-    1:1:java.lang.String toSourceStringWithoutHolder():265:265 -> y0
+    1:1:com.android.tools.r8.graph.DexType getReturnType():98:98 -> u0
+    1:1:com.android.tools.r8.graph.DexMethodSignature com.android.tools.r8.graph.DexMethodSignature.create(com.android.tools.r8.graph.DexMethod):17:17 -> v0
+    1:1:com.android.tools.r8.graph.DexMethodSignature getSignature():173 -> v0
+    1:1:java.lang.String qualifiedName():251:251 -> w0
+    1:1:java.lang.String toSourceStringWithoutHolder():265:265 -> x0
 com.android.tools.r8.graph.DexMethodHandle -> com.android.tools.r8.graph.T0:
     com.android.tools.r8.graph.DexMethodHandle$MethodHandleType type -> e
     boolean $assertionsDisabled -> i
@@ -28874,11 +28863,10 @@
     com.android.tools.r8.graph.DexMethod asDexMethod() -> i0
     com.android.tools.r8.graph.DexType asDexType() -> j0
     boolean isDexField() -> k0
-    boolean isDexMember() -> l0
-    boolean isDexMethod() -> m0
-    1:1:boolean isDexType():0:0 -> n0
-    1:1:int referenceTypeOrder():87 -> n0
-    2:5:int referenceTypeOrder():90:93 -> n0
+    boolean isDexMethod() -> l0
+    1:1:boolean isDexType():0:0 -> m0
+    1:1:int referenceTypeOrder():87 -> m0
+    2:5:int referenceTypeOrder():90:93 -> m0
     com.android.tools.r8.graph.DexType getContextType() -> y
 com.android.tools.r8.graph.DexString -> com.android.tools.r8.graph.c1:
     com.android.tools.r8.graph.DexString[] EMPTY_ARRAY -> g
@@ -28965,30 +28953,29 @@
     60:60:void <init>(com.android.tools.r8.graph.DexString):51:51 -> <init>
     61:61:void <init>(com.android.tools.r8.graph.DexString):51:51 -> <init>
     57:58:void <init>(com.android.tools.r8.graph.DexString):51:52 -> <init>
-    1:1:boolean isBooleanType():280:280 -> A0
-    1:1:boolean isClassType():323:323 -> B0
-    1:1:boolean isDoubleType():308:308 -> C0
-    1:1:boolean isFloatType():300:300 -> D0
-    1:1:boolean isIntType():296:296 -> E0
-    1:1:boolean isLegacySynthesizedTypeAllowedDuplication():353:353 -> F0
-    2:3:boolean oldSynthesizedName(java.lang.String):357:358 -> F0
-    2:3:boolean isLegacySynthesizedTypeAllowedDuplication():353 -> F0
-    1:1:boolean isLongType():304:304 -> G0
-    1:2:boolean isNullValueType():312:313 -> H0
-    1:4:boolean isPrimitiveArrayType():334:337 -> I0
-    1:1:boolean isPrimitiveType():272:272 -> J0
-    1:2:boolean isReferenceType():328:329 -> K0
+    1:1:boolean isClassType():323:323 -> A0
+    1:1:boolean isDoubleType():308:308 -> B0
+    1:1:boolean isFloatType():300:300 -> C0
+    1:1:boolean isIntType():296:296 -> D0
+    1:1:boolean isLegacySynthesizedTypeAllowedDuplication():353:353 -> E0
+    2:3:boolean oldSynthesizedName(java.lang.String):357:358 -> E0
+    2:3:boolean isLegacySynthesizedTypeAllowedDuplication():353 -> E0
+    1:1:boolean isLongType():304:304 -> F0
+    1:2:boolean isNullValueType():312:313 -> G0
+    1:4:boolean isPrimitiveArrayType():334:337 -> H0
+    1:1:boolean isPrimitiveType():272:272 -> I0
+    1:2:boolean isReferenceType():328:329 -> J0
+    1:1:boolean isVoidType():276:276 -> K0
     com.android.tools.r8.utils.structural.StructuralItem self() -> L
-    1:1:boolean isVoidType():276:276 -> L0
-    1:1:boolean isWideType():341:341 -> M0
-    1:4:java.lang.String toBinaryName():179:182 -> N0
-    5:5:java.lang.String toBinaryName():180:180 -> N0
-    6:6:java.lang.String toBinaryName():0:0 -> N0
+    1:1:boolean isWideType():341:341 -> L0
+    1:4:java.lang.String toBinaryName():179:182 -> M0
+    5:5:java.lang.String toBinaryName():180:180 -> M0
+    6:6:java.lang.String toBinaryName():0:0 -> M0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":189,"3":190}}
-    189:189:java.lang.String toBinaryName():183:183 -> N0
-    190:190:java.lang.String toBinaryName():183:183 -> N0
-    1:1:java.lang.String toDescriptorString():175:175 -> O0
-    1:1:char toShorty():229:229 -> P0
+    189:189:java.lang.String toBinaryName():183:183 -> M0
+    190:190:java.lang.String toBinaryName():183:183 -> M0
+    1:1:java.lang.String toDescriptorString():175:175 -> N0
+    1:1:char toShorty():229:229 -> O0
     1:1:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):30:30 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.graph.DexType,com.android.tools.r8.utils.structural.CompareToVisitor):99:99 -> a
     2:2:int acceptCompareTo(com.android.tools.r8.utils.structural.StructuralItem,com.android.tools.r8.utils.structural.CompareToVisitor):30 -> a
@@ -29061,28 +29048,29 @@
     1:2:boolean computeEquals(java.lang.Object):129:130 -> g
     com.android.tools.r8.graph.DexType asDexType() -> j0
     1:1:com.android.tools.r8.utils.structural.StructuralMapping getStructuralMapping():93:93 -> n
-    1:1:com.android.tools.r8.references.ClassReference asClassReference():56:56 -> o0
-    1:16:int elementSizeForPrimitiveArrayType():384:399 -> p0
-    17:17:int elementSizeForPrimitiveArrayType():0:0 -> p0
+    1:1:com.android.tools.r8.references.ClassReference asClassReference():56:56 -> n0
+    1:16:int elementSizeForPrimitiveArrayType():384:399 -> o0
+    17:17:int elementSizeForPrimitiveArrayType():0:0 -> o0
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":417,"2":418,"3":419}}
-    417:417:int elementSizeForPrimitiveArrayType():399:399 -> p0
-    418:418:int elementSizeForPrimitiveArrayType():399:399 -> p0
-    419:419:int elementSizeForPrimitiveArrayType():399:399 -> p0
-    416:416:int elementSizeForPrimitiveArrayType():399:399 -> p0
-    1:1:com.android.tools.r8.graph.DexString getDescriptor():114:114 -> q0
-    1:2:java.lang.String getInternalName():522:523 -> r0
-    1:4:java.lang.String getName():503:506 -> s0
-    1:1:int getNumberOfLeadingSquareBrackets():405:405 -> t0
+    417:417:int elementSizeForPrimitiveArrayType():399:399 -> o0
+    418:418:int elementSizeForPrimitiveArrayType():399:399 -> o0
+    419:419:int elementSizeForPrimitiveArrayType():399:399 -> o0
+    416:416:int elementSizeForPrimitiveArrayType():399:399 -> o0
+    1:1:com.android.tools.r8.graph.DexString getDescriptor():114:114 -> p0
+    1:2:java.lang.String getInternalName():522:523 -> q0
+    1:4:java.lang.String getName():503:506 -> r0
+    1:1:int getNumberOfLeadingSquareBrackets():405:405 -> s0
+    1:1:java.lang.String getPackageDescriptor():499:499 -> t0
     1:1:java.lang.String toString():240:240 -> toString
-    1:1:java.lang.String getPackageDescriptor():499:499 -> u0
-    1:1:java.lang.String getPackageName():527:527 -> v0
-    2:4:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageNameFromBinaryName(java.lang.String):512:514 -> v0
-    2:4:java.lang.String getPackageName():527 -> v0
-    1:2:int getRequiredRegisters():118:119 -> w0
-    1:2:java.lang.String getSimpleName():510:511 -> x0
+    1:1:java.lang.String getPackageName():527:527 -> u0
+    2:4:java.lang.String com.android.tools.r8.utils.DescriptorUtils.getPackageNameFromBinaryName(java.lang.String):512:514 -> u0
+    2:4:java.lang.String getPackageName():527 -> u0
+    1:2:int getRequiredRegisters():118:119 -> v0
+    1:2:java.lang.String getSimpleName():510:511 -> w0
+    1:1:java.lang.String getTypeName():212:212 -> x0
     com.android.tools.r8.graph.DexType getContextType() -> y
-    1:1:java.lang.String getTypeName():212:212 -> y0
-    1:1:boolean isArrayType():318:318 -> z0
+    1:1:boolean isArrayType():318:318 -> y0
+    1:1:boolean isBooleanType():280:280 -> z0
 com.android.tools.r8.graph.DexTypeList -> com.android.tools.r8.graph.e1:
     com.android.tools.r8.graph.DexTypeList theEmptyTypeList -> c
     com.android.tools.r8.graph.DexType[] values -> b
@@ -32099,7 +32087,7 @@
     1:3:void visitEnd():884:886 -> c
     4:5:boolean classRequiresCode():876:877 -> c
     4:5:void visitEnd():886 -> c
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1821:1821 -> c
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1824:1824 -> c
     6:6:boolean classRequiresCode():877 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:void visitEnd():886 -> c
@@ -35404,7 +35392,7 @@
     16:16:java.util.List fixupInnerClassAttributes(java.util.List):205 -> b
     17:28:java.util.List fixupInnerClassAttributes(java.util.List):206:217 -> b
     29:36:java.util.List fixupInnerClassAttributes(java.util.List):216:223 -> b
-    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():604:604 -> b
+    37:37:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():607:607 -> b
     37:37:java.util.List fixupInnerClassAttributes(java.util.List):223 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     38:44:java.util.List fixupInnerClassAttributes(java.util.List):223:229 -> b
@@ -35636,7 +35624,7 @@
     3:3:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57:57 -> a
     4:4:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):65:65 -> a
     4:4:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     5:5:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):66 -> a
     5:5:void traceInvokeVirtual(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):57 -> a
     6:6:boolean com.android.tools.r8.graph.analysis.InvokeVirtualToInterfaceVerifyErrorWorkaround.isInterfaceInSomeApiLevel(com.android.tools.r8.graph.DexType):67:67 -> a
@@ -40241,7 +40229,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):43:43 -> <init>
     2:6:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.proto.ProtoReferences):41:45 -> <init>
     1:1:void clearDeadEnumLiteMaps():59:59 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1561:1561 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.isEnumLiteProtoShrinkingEnabled():1564:1564 -> a
     2:2:void clearDeadEnumLiteMaps():59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void clearDeadEnumLiteMaps():59:67 -> a
@@ -40819,16 +40807,16 @@
     8:8:com.android.tools.r8.utils.Reporter com.android.tools.r8.graph.AppView.reporter():502:502 -> a
     8:8:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66 -> a
     9:13:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):66:70 -> a
-    14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1542:1546 -> a
+    14:18:void com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.disable():1545:1549 -> a
     14:18:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):70 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     19:19:com.android.tools.r8.ir.analysis.proto.ProtoShrinker create(com.android.tools.r8.graph.AppView):74:74 -> a
     20:20:java.util.Set getDeadProtoTypes():78:78 -> a
     21:23:boolean verifyDeadProtoTypesNotReferenced(com.android.tools.r8.dex.VirtualFile):88:90 -> a
-    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():919:919 -> a
+    24:24:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():922:922 -> a
     24:24:void setDeadProtoTypes(java.util.Set):83 -> a
     25:25:void setDeadProtoTypes(java.util.Set):84:84 -> a
-    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():920:920 -> a
+    26:26:void com.android.tools.r8.utils.InternalOptions.checkAssertionsEnabled():923:923 -> a
     26:26:void setDeadProtoTypes(java.util.Set):83 -> a
 com.android.tools.r8.ir.analysis.proto.ProtoUtils -> com.android.tools.r8.internal.YP:
     boolean $assertionsDisabled -> a
@@ -42204,24 +42192,40 @@
     9:9:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):209:209 -> a
     10:10:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNull():42:42 -> a
     10:10:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):211 -> a
-    11:16:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):212:217 -> a
-    17:17:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    17:17:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):219 -> a
-    18:18:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):220:220 -> a
-    19:19:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder com.android.tools.r8.ir.analysis.value.NumberFromSetValue.builder(com.android.tools.r8.ir.analysis.value.SingleNumberValue):32:32 -> a
-    19:19:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):220 -> a
-    20:20:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):222:222 -> a
-    21:21:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
-    21:21:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):222 -> a
-    22:23:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):222:223 -> a
-    24:24:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder com.android.tools.r8.ir.analysis.value.NumberFromSetValue.instanceBuilder():36:36 -> a
-    24:24:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):223 -> a
+    11:11:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):212:212 -> a
+    12:12:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
+    12:12:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):214 -> a
+    13:13:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):214:214 -> a
+    14:14:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
+    14:14:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):217 -> a
+    15:15:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):218:218 -> a
+    16:16:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    16:16:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):221 -> a
+    17:17:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):223:223 -> a
+    18:18:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
+    18:18:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):223 -> a
+    19:19:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):223:223 -> a
+    20:20:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNullOrAbstractValue():0:0 -> a
+    20:20:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):224 -> a
+    21:24:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):224:227 -> a
     25:25:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
-    25:25:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):225 -> a
-    26:28:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):226:228 -> a
-    29:29:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
-    29:29:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):228 -> a
-    30:35:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):228:233 -> a
+    25:25:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):229 -> a
+    26:26:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):230:230 -> a
+    27:27:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder com.android.tools.r8.ir.analysis.value.NumberFromSetValue.builder(com.android.tools.r8.ir.analysis.value.SingleNumberValue):32:32 -> a
+    27:27:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):230 -> a
+    28:28:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
+    28:28:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):232 -> a
+    29:30:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):232:233 -> a
+    31:31:com.android.tools.r8.ir.analysis.value.NumberFromSetValue$Builder com.android.tools.r8.ir.analysis.value.NumberFromSetValue.instanceBuilder():36:36 -> a
+    31:31:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):233 -> a
+    32:32:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isSingleNumberValue():0:0 -> a
+    32:32:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):235 -> a
+    33:33:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):236:236 -> a
+    34:34:boolean com.android.tools.r8.ir.analysis.value.AbstractValue.isNumberFromSetValue():0:0 -> a
+    34:34:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):238 -> a
+    35:38:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):238:241 -> a
+    39:39:com.android.tools.r8.ir.analysis.value.UnknownValue com.android.tools.r8.ir.analysis.value.AbstractValue.unknown():20:20 -> a
+    39:39:com.android.tools.r8.ir.analysis.value.AbstractValue join(com.android.tools.r8.ir.analysis.value.AbstractValue,com.android.tools.r8.ir.analysis.value.AbstractValueFactory,boolean,boolean):243 -> a
     com.android.tools.r8.ir.analysis.value.NonConstantNumberValue asNonConstantNumberValue() -> b
     com.android.tools.r8.ir.analysis.value.AbstractValue rewrittenWithLens(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.GraphLens) -> b
     boolean isNonConstantNumberValue() -> c
@@ -43656,7 +43660,7 @@
 com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo$EnumUnboxingLocalUtility -> com.android.tools.r8.internal.u4:
 # {"id":"sourceFile","fileName":"R8$$SyntheticClass"}
 # {"id":"com.android.tools.r8.synthesized"}
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     1:1:com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo com.android.tools.r8.ir.code.BasicBlock$ThrowingInfo.defaultForConstString(com.android.tools.r8.utils.InternalOptions):124 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
 com.android.tools.r8.ir.code.BasicBlockInstructionIterator -> com.android.tools.r8.internal.x4:
@@ -44370,7 +44374,7 @@
     5:5:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71 -> a
     6:7:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):71:72 -> a
     8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:134 -> a
-    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    9:9:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     10:13:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):134:137 -> a
@@ -47240,7 +47244,7 @@
     1:1:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47 -> a
     2:3:void buildDex(com.android.tools.r8.ir.conversion.DexBuilder):47:48 -> a
     4:6:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):85:87 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     7:7:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):88 -> a
     8:8:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):91:91 -> a
     9:9:com.android.tools.r8.ir.optimize.DeadCodeRemover$DeadInstructionResult canBeDeadCode(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode):89:89 -> a
@@ -49159,7 +49163,7 @@
     void resolveAndBuildSwitch(int,int,int,com.android.tools.r8.ir.conversion.IRBuilder) -> a
     boolean verifyLocalInScope(com.android.tools.r8.graph.DebugLocalInfo) -> a
     1:3:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):303:305 -> a
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     4:4:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:7:int traceInstruction(int,com.android.tools.r8.ir.conversion.IRBuilder):305:305 -> a
@@ -51148,7 +51152,7 @@
     79:83:void addGoto(int):1446:1450 -> b
     84:87:void addInstancePut(int,int,com.android.tools.r8.graph.DexField):1552:1555 -> b
     88:88:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718:1718 -> b
-    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    89:89:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     89:89:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     90:96:void addMultiNewArray(com.android.tools.r8.graph.DexType,int,int[]):1718:1724 -> b
@@ -51549,7 +51553,7 @@
     242:246:com.android.tools.r8.graph.DexApplication com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsD8(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication):407:411 -> a
     242:246:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):385 -> a
     247:249:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):388:390 -> a
-    250:250:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    250:250:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     250:250:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):390 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     251:251:void convert(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):391:391 -> a
@@ -51577,20 +51581,20 @@
     314:316:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):495 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     317:348:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):497:528 -> a
-    349:353:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1915:1919 -> a
+    349:353:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1918:1922 -> a
     349:353:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     354:354:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    354:354:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1920 -> a
+    354:354:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1923 -> a
     354:354:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):528 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     355:355:void convertMethods(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer$D8CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.D8MethodProcessor,com.android.tools.r8.ir.desugar.itf.InterfaceProcessor):527:527 -> a
     356:359:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):537:540 -> a
-    360:364:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1915:1919 -> a
+    360:364:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1918:1922 -> a
     360:364:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     365:365:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    365:365:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1920 -> a
+    365:365:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1923 -> a
     365:365:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):540 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     366:372:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):539:545 -> a
@@ -51611,12 +51615,12 @@
     402:402:void com.android.tools.r8.ir.conversion.IRConverter.checkPrefixMerging(com.android.tools.r8.graph.ProgramMethod):605:605 -> a
     402:402:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):548 -> a
     403:403:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):549:549 -> a
-    404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    404:404:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     404:404:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):549 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     405:415:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):549:559 -> a
     416:425:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):552:561 -> a
-    426:426:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    426:426:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     426:426:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):561 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     427:427:void convertMethod(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):562:562 -> a
@@ -51712,11 +51716,11 @@
     4212:4226:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1350:1364 -> a
     4227:4258:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1363:1394 -> a
     4259:4306:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1383:1430 -> a
-    4307:4307:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4307:4307:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     4307:4307:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1430 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4308:4330:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1431:1453 -> a
-    4331:4336:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1183:1188 -> a
+    4331:4336:boolean com.android.tools.r8.utils.InternalOptions.methodMatchesLogArgumentsFilter(com.android.tools.r8.graph.DexEncodedMethod):1186:1191 -> a
     4331:4336:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1453 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4337:4394:com.android.tools.r8.utils.Timing optimize(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):1453:1510 -> a
@@ -51730,7 +51734,7 @@
     4420:4420:com.android.tools.r8.ir.optimize.InliningOracle lambda$optimize$22(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.conversion.MethodProcessor):1396 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4421:4466:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1534:1579 -> a
-    4467:4467:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1550:1550 -> a
+    4467:4467:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1553:1553 -> a
     4467:4467:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1579 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4468:4473:void collectOptimizationInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.ClassInitializerDefaultsOptimization$ClassInitializerDefaultsResult,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodProcessor,com.android.tools.r8.ir.conversion.MethodConversionOptions$MutableMethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider$Builder,com.android.tools.r8.utils.Timing):1580:1585 -> a
@@ -51738,7 +51742,7 @@
     4475:4483:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1597:1605 -> a
     4484:4484:void removeDeadCodeAndFinalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.utils.Timing):1601:1601 -> a
     4485:4486:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1615:1616 -> a
-    4487:4487:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    4487:4487:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     4487:4487:void finalizeIR(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions,com.android.tools.r8.graph.bytecodemetadata.BytecodeMetadataProvider,com.android.tools.r8.utils.Timing):1616 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4488:4493:void com.android.tools.r8.ir.conversion.IRConverter.finalizeToCf(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.info.OptimizationFeedback,com.android.tools.r8.ir.conversion.MethodConversionOptions):1626:1631 -> a
@@ -51826,7 +51830,7 @@
     93:93:void com.android.tools.r8.ir.conversion.IRConverter.commitPendingSyntheticItemsR8(com.android.tools.r8.graph.AppView):418:418 -> b
     93:93:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):699 -> b
     94:156:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):704:766 -> b
-    157:157:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    157:157:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     157:157:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):766 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     158:158:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):767:767 -> b
@@ -51841,7 +51845,7 @@
     177:210:com.android.tools.r8.graph.DexApplication optimize(com.android.tools.r8.graph.AppView,java.util.concurrent.ExecutorService):785:818 -> b
     211:211:void lambda$optimize$9(com.android.tools.r8.graph.GraphLens,com.android.tools.r8.ir.optimize.staticizer.ClassStaticizer):655:655 -> b
     212:216:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):827:831 -> b
-    217:217:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1550:1550 -> b
+    217:217:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1553:1553 -> b
     217:217:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):831 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     218:225:void waveDone(com.android.tools.r8.utils.collections.ProgramMethodSet,java.util.concurrent.ExecutorService):832:839 -> b
@@ -53322,7 +53326,7 @@
     84:84:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):126 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:93:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):127:135 -> a
-    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    94:94:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     94:94:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):135 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     95:109:com.android.tools.r8.ir.desugar.BackportedMethodRewriter$MethodProvider getMethodProviderOrNull(com.android.tools.r8.graph.DexMethod):135:149 -> a
@@ -53423,12 +53427,12 @@
     1:1:void <init>():18:18 -> <init>
     void synthesizeClasses(java.util.concurrent.ExecutorService,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer) -> a
     1:2:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):22:23 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     3:3:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):23 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43:43 -> a
     4:4:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):25 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     5:5:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):43 -> a
     5:5:com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):25 -> a
     6:9:com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.create(com.android.tools.r8.graph.AppView):44:47 -> a
@@ -53471,7 +53475,7 @@
     void withD8NestBasedAccessDesugaring(com.android.tools.r8.utils.ThrowingConsumer) -> a
     void withDesugaredLibraryAPIConverter(java.util.function.Consumer) -> a
     1:6:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):33:38 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     7:7:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):38 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:10:com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):39:41 -> a
@@ -53590,7 +53594,7 @@
     1:1:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):27:27 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):59:61 -> a
     2:4:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):28 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):61 -> a
     5:5:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):28 -> a
     6:24:com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringCollection$NonEmptyCfPostProcessingDesugaringCollection.create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.itf.InterfaceMethodProcessorFacade,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):62:80 -> a
@@ -53913,7 +53917,7 @@
     209:214:com.android.tools.r8.graph.DexField getCaptureField(int):140:145 -> a
     215:215:com.android.tools.r8.graph.DexField getCaptureField(int):142:142 -> a
     216:217:boolean canAccessModifyLambdaImplMethod():326:327 -> a
-    218:218:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1767:1767 -> a
+    218:218:boolean com.android.tools.r8.utils.InternalOptions.canAccessModifyLambdaImplementationMethods(com.android.tools.r8.graph.AppView):1770:1770 -> a
     218:218:boolean canAccessModifyLambdaImplMethod():327 -> a
     219:222:boolean com.android.tools.r8.ir.desugar.LambdaClass.isPrivateOrStaticInterfaceMethodInvokeThatWillBeDesugared():319:322 -> a
     219:222:boolean canAccessModifyLambdaImplMethod():328 -> a
@@ -54086,7 +54090,7 @@
     54:77:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.AccessorMethodSourceCode.build(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethodHandle$MethodHandleType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):28:51 -> a
     54:77:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):812 -> a
     78:85:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):811:818 -> a
-    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    86:86:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     86:86:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     87:89:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):818:820 -> a
@@ -54099,15 +54103,15 @@
     1:1:void <clinit>():696:696 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):703:705 -> <init>
     1:33:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):715:747 -> a
-    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    34:34:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     34:34:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     35:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):747:750 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):750 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:40:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:751 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     41:41:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     42:51:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):751:760 -> a
@@ -54120,15 +54124,15 @@
     1:1:void <clinit>():604:604 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.DexMethod,boolean,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.AppView):611:613 -> <init>
     1:38:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):622:659 -> a
-    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    39:39:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     39:39:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     40:43:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):659:662 -> a
-    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    44:44:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     44:44:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):662 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     45:45:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:663 -> a
-    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    46:46:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     46:46:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     47:56:com.android.tools.r8.graph.ProgramMethod ensureAccessibility(com.android.tools.r8.ir.desugar.lambda.ForcefullyMovedLambdaMethodConsumer,java.util.function.Consumer):663:672 -> a
@@ -54556,7 +54560,7 @@
     1:1:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):64:64 -> <init>
     2:89:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):52:139 -> <init>
     1:2:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):144:145 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3:3:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:com.android.tools.r8.ir.desugar.NonEmptyCfInstructionDesugaringCollection createForCfToCfNonDesugar(com.android.tools.r8.graph.AppView):145:146 -> a
@@ -54708,31 +54712,31 @@
     1:1:void <clinit>():38:38 -> <clinit>
     1:3:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.androidapi.AndroidApiLevelCompute):43:45 -> <init>
     1:5:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):58:62 -> a
-    6:9:java.util.Collection com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.desugarLibraryCall(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory):109:112 -> a
+    6:9:java.util.Collection com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.desugarLibraryCall(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.cf.code.CfInvoke,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory):114:117 -> a
     6:9:java.util.Collection desugarInstruction(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.ir.desugar.FreshLocalProvider,com.android.tools.r8.ir.desugar.LocalStackAllocator,com.android.tools.r8.ir.desugar.CfInstructionDesugaringEventConsumer,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.desugar.CfInstructionDesugaringCollection,com.android.tools.r8.graph.DexItemFactory):60 -> a
     10:14:boolean needsDesugaring(com.android.tools.r8.cf.code.CfInstruction,com.android.tools.r8.graph.ProgramMethod):71:75 -> a
     15:26:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):80:91 -> a
     27:27:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     27:27:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):92 -> a
     28:30:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):95:97 -> a
-    31:36:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):96:101 -> a
-    37:37:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):93:93 -> a
-    38:40:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):121:123 -> a
-    41:43:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):163:165 -> a
-    41:43:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):124 -> a
-    44:45:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):124:125 -> a
-    46:46:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2582:2582 -> a
-    46:46:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2586 -> a
-    46:46:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):125 -> a
-    47:47:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2586:2586 -> a
-    47:47:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):125 -> a
-    48:50:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):126:128 -> a
-    51:53:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):134:136 -> a
-    54:54:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():342:342 -> a
-    54:54:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):137 -> a
-    55:59:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):137:141 -> a
-    60:69:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):135:144 -> a
-    70:78:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):147:155 -> a
+    31:41:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):96:106 -> a
+    42:42:com.android.tools.r8.androidapi.ComputedApiLevel getComputedApiLevelForMethodOnHolderWithMinApi(com.android.tools.r8.cf.code.CfInstruction):93:93 -> a
+    43:45:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):126:128 -> a
+    46:48:boolean com.android.tools.r8.ir.desugar.apimodel.ApiInvokeOutlinerDesugaring.verifyLibraryHolderAndInvoke(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod,boolean):168:170 -> a
+    46:48:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):129 -> a
+    49:50:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):129:130 -> a
+    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProto(com.android.tools.r8.graph.DexMethod):2582:2582 -> a
+    51:51:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2586 -> a
+    51:51:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):130 -> a
+    52:52:com.android.tools.r8.graph.DexProto com.android.tools.r8.graph.DexItemFactory.prependHolderToProtoIf(com.android.tools.r8.graph.DexMethod,boolean):2586:2586 -> a
+    52:52:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):130 -> a
+    53:55:com.android.tools.r8.graph.ProgramMethod ensureOutlineMethod(com.android.tools.r8.contexts.CompilationContext$UniqueContext,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.androidapi.ComputedApiLevel,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.cf.code.CfInvoke):131:133 -> a
+    56:58:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):139:141 -> a
+    59:59:com.android.tools.r8.graph.AccessFlags$BuilderBase com.android.tools.r8.graph.AccessFlags$BuilderBase.setPublic():342:342 -> a
+    59:59:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):142 -> a
+    60:64:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):142:146 -> a
+    65:74:void lambda$ensureOutlineMethod$1(com.android.tools.r8.graph.DexProto,com.android.tools.r8.androidapi.ComputedApiLevel,boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.synthesis.SyntheticMethodBuilder):140:149 -> a
+    75:83:com.android.tools.r8.graph.Code lambda$ensureOutlineMethod$0(boolean,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexMethod):152:160 -> a
 com.android.tools.r8.ir.desugar.backports.BackportedMethods -> com.android.tools.r8.internal.i4:
     1:20:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2122:2141 -> A
     21:34:com.android.tools.r8.graph.CfCode IntegerMethods_parseIntSubsequenceWithRadix(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.graph.DexMethod):2135:2148 -> A
@@ -56336,12 +56340,12 @@
     7:12:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):59:64 -> a
     13:37:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):102:126 -> a
     13:37:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    38:38:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     38:38:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):126 -> a
     38:38:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     39:40:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):130:131 -> a
     39:40:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     41:41:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):131 -> a
     41:41:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):65 -> a
     42:42:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldRegisterCallback(com.android.tools.r8.graph.ProgramMethod):134:134 -> a
@@ -56369,7 +56373,7 @@
     102:102:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     102:102:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
     103:103:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157:157 -> a
-    104:104:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    104:104:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     104:104:boolean overridesNonFinalLibraryMethod(com.android.tools.r8.graph.ProgramMethod):157 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     105:111:boolean com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryAPICallbackSynthesizer.shouldGenerateCallbacksForEmulateInterfaceAPIs(com.android.tools.r8.graph.DexClass):181:187 -> a
@@ -56597,7 +56601,7 @@
     87:93:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):147:153 -> a
     94:96:com.android.tools.r8.graph.DexMethod getExistingProgramEnumConversionMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):152:154 -> a
     97:101:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):160:164 -> a
-    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    102:102:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     102:102:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     103:109:com.android.tools.r8.graph.DexProgramClass ensureProgramEnumConversionClass(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):164:170 -> a
@@ -56644,7 +56648,7 @@
     30:30:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
     13:24:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):200:211 -> a
     13:24:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     25:25:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):211 -> a
     25:25:boolean shouldConvert(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):131 -> a
     26:26:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.reportInvalidInvoke(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.ProgramMethod):214:214 -> a
@@ -56666,7 +56670,7 @@
     57:59:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):165:167 -> a
     60:60:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:291 -> a
     60:60:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     61:61:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
     61:61:com.android.tools.r8.graph.DexMethod getExistingProgramConversionMethod(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):169 -> a
     62:63:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:292 -> a
@@ -56692,14 +56696,14 @@
     82:82:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     82:82:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229 -> a
     83:83:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:229 -> a
-    84:84:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    84:84:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     84:84:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     85:86:com.android.tools.r8.graph.DexClass getValidClassToWrap(com.android.tools.r8.graph.DexType):229:230 -> a
     87:88:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):259:260 -> a
     89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:291 -> a
     89:89:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
-    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    90:90:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291 -> a
     90:90:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions ensureWrappers(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryClasspathWrapperSynthesizeEventConsumer):261 -> a
     91:92:com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer$WrapperConversions com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.getExistingProgramWrapperConversions(com.android.tools.r8.graph.DexClass):291:292 -> a
@@ -56737,7 +56741,7 @@
     138:138:com.android.tools.r8.graph.ProgramMethod com.android.tools.r8.synthesis.SyntheticItems.ensureFixedClassMethod(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexProto,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.graph.AppView,java.util.function.Consumer,java.util.function.Consumer):545:545 -> a
     138:138:void getExistingProgramConversionMethod(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass):375 -> a
     139:139:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327:327 -> a
-    140:140:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    140:140:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     140:140:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     141:145:com.android.tools.r8.graph.DexProgramClass ensureProgramWrapper(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):327:331 -> a
@@ -56791,7 +56795,7 @@
     830:830:java.util.List allImplementedMethods(com.android.tools.r8.graph.DexClass):604:604 -> a
     831:855:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):609:633 -> a
     831:855:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
-    856:856:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    856:856:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     856:856:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633 -> a
     856:856:java.util.List lambda$allImplementedMethods$12(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):605 -> a
     857:865:java.util.List com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.internalAllImplementedMethods(com.android.tools.r8.graph.DexClass):633:641 -> a
@@ -56799,7 +56803,7 @@
     866:877:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):670:681 -> a
     878:881:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):695:698 -> a
     878:881:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
-    882:882:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    882:882:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     882:882:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):698 -> a
     882:882:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):682 -> a
     883:885:void com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizer.ensureProgramWrappersWithoutVirtualMethods(com.android.tools.r8.graph.DexClass,com.android.tools.r8.ir.desugar.desugaredlibrary.apiconversion.DesugaredLibraryWrapperSynthesizerEventConsumer$DesugaredLibraryL8ProgramWrapperSynthesizerEventConsumer):698:700 -> a
@@ -56841,7 +56845,7 @@
     2:2:boolean com.android.tools.r8.com.google.common.collect.Iterables.any(java.lang.Iterable,com.android.tools.r8.com.google.common.base.Predicate):608:608 -> c
     2:2:boolean isInvalidWrapper(com.android.tools.r8.graph.DexClass):391 -> c
     3:18:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):513:528 -> c
-    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> c
+    19:19:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> c
     19:19:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):528 -> c
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     20:24:java.util.Collection synthesizeVirtualMethodsForTypeWrapper(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexEncodedField):528:532 -> c
@@ -57375,7 +57379,7 @@
     1:1:void <clinit>():12:12 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):29:32 -> <init>
     1:1:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):20:20 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     2:2:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):20 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:8:com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterL8Synthesizer create(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):20:25 -> a
@@ -57423,12 +57427,12 @@
     1:1:void <clinit>():33:33 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.RetargetingInfo):40:43 -> <init>
     1:1:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:52 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     2:2:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:4:void postProcessingDesugaring(java.util.Collection,com.android.tools.r8.ir.desugar.CfPostProcessingDesugaringEventConsumer,java.util.concurrent.ExecutorService):52:53 -> a
     5:5:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     6:6:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     7:7:void ensureInterfacesAndForwardingMethodsSynthesized(java.util.Collection,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterPostProcessingEventConsumer):59:59 -> a
@@ -57489,7 +57493,7 @@
     1:1:void <clinit>():22:22 -> <clinit>
     1:2:void <init>(com.android.tools.r8.graph.AppView):26:27 -> <init>
     1:2:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):33:34 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     3:3:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):34 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:7:com.android.tools.r8.graph.DexClass ensureEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):35:38 -> a
@@ -57501,7 +57505,7 @@
     29:29:void lambda$ensureProgramEmulatedHolderDispatchMethod$2(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticProgramClassBuilder):77:77 -> a
     30:30:void lambda$ensureEmulatedInterfaceDispatchMethod$4(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder):103:103 -> a
     31:31:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:113 -> a
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     32:32:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:39:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):113:119 -> a
@@ -57522,13 +57526,13 @@
     65:65:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159 -> a
     66:71:void lambda$buildHolderDispatchMethod$10(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):159:164 -> a
     72:72:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166:166 -> a
-    73:73:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    73:73:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     73:73:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):166 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     74:74:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):174:174 -> a
     75:81:com.android.tools.r8.graph.Code lambda$buildHolderDispatchMethod$9(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.graph.DexMethod):168:174 -> a
     1:2:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):64:65 -> b
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> b
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> b
     3:3:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:13:void ensureProgramEmulatedHolderDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer):65:74 -> b
@@ -57537,7 +57541,7 @@
     17:21:void com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSyntheticHelper.rewriteType(com.android.tools.r8.graph.DexType):180:184 -> b
     17:21:void lambda$ensureProgramEmulatedHolderDispatchMethod$3(com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterL8SynthesizerEventConsumer,com.android.tools.r8.graph.DexProgramClass):80 -> b
     22:23:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):87:88 -> b
-    24:24:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> b
+    24:24:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> b
     24:24:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):88 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:28:com.android.tools.r8.graph.DexClass ensureEmulatedInterfaceDispatchMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.desugaredlibrary.retargeter.DesugaredLibraryRetargeterSynthesizerEventConsumer$DesugaredLibraryRetargeterInstructionEventConsumer):89:92 -> b
@@ -58238,7 +58242,7 @@
     1:1:void <clinit>():21:21 -> <clinit>
     1:4:void <init>(com.android.tools.r8.graph.AppView):26:29 -> <init>
     1:1:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33:33 -> a
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     2:2:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:6:void rewriteApplication(com.android.tools.r8.graph.DexApplication$Builder):33:36 -> a
@@ -58291,7 +58295,7 @@
     3:3:boolean com.android.tools.r8.graph.DexClass.isLibraryClass():0:0 -> a
     3:3:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94 -> a
     4:4:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94:94 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     5:5:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:boolean isInDesugaredLibrary(com.android.tools.r8.graph.DexClass):94:95 -> a
@@ -58313,7 +58317,7 @@
     38:38:boolean com.android.tools.r8.graph.Definition.isProgramMethod():0:0 -> a
     38:38:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):203 -> a
     39:39:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204:204 -> a
-    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    40:40:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     40:40:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     41:47:com.android.tools.r8.graph.DexClassAndMethod ensureEmulatedInterfaceMethod(com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.desugar.itf.EmulatedInterfaceSynthesizerEventConsumer$ClasspathEmulatedInterfaceSynthesizerEventConsumer):204:210 -> a
@@ -59072,7 +59076,7 @@
     111:118:com.android.tools.r8.graph.CfCode com.android.tools.r8.ir.desugar.itf.ProgramEmulatedInterfaceSynthesizer.synthesizeCfCode(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):148:155 -> a
     111:118:com.android.tools.r8.graph.Code lambda$synthesizeEmulatedInterfaceMethod$3(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexMethod):135 -> a
     119:119:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:230 -> a
-    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    120:120:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     120:120:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     121:132:void synthesizeClasses(com.android.tools.r8.ir.desugar.CfClassSynthesizerDesugaringEventConsumer):230:241 -> a
@@ -59195,42 +59199,42 @@
     1:8:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):42:49 -> b
     9:9:void lambda$reportDesugarDependencies$0(com.android.tools.r8.ir.desugar.nest.Nest):43:43 -> b
     10:10:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54:54 -> b
-    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):932:932 -> b
+    11:11:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935:935 -> b
     11:11:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:12:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> b
-    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    12:12:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     12:12:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934:934 -> b
+    13:13:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937:937 -> b
     13:13:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):938:938 -> b
-    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    14:14:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):941:941 -> b
+    14:14:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     14:14:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     15:15:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):0:0 -> b
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":20,"2":21,"3":22}}
-    20:20:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
-    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    20:20:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):942:942 -> b
+    20:20:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     20:20:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
-    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    21:21:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):942:942 -> b
+    21:21:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     21:21:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:939 -> b
-    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    22:22:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):942:942 -> b
+    22:22:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     22:22:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    16:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):939:940 -> b
-    16:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934 -> b
+    16:17:java.lang.String com.android.tools.r8.utils.InternalOptions.messageErrorMissingNestHost(com.android.tools.r8.graph.DexClass):942:943 -> b
+    16:17:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937 -> b
     16:17:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):934:934 -> b
+    18:18:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):937:937 -> b
     18:18:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):932:932 -> b
+    19:19:java.lang.RuntimeException com.android.tools.r8.utils.InternalOptions.errorMissingNestHost(com.android.tools.r8.graph.DexClass):935:935 -> b
     19:19:void lambda$reportDesugarDependencies$1(com.android.tools.r8.graph.DexClass):54 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     23:23:void clearNestAttributes():59:59 -> b
@@ -59335,8 +59339,8 @@
     void lambda$getMethodBridgeReference$5(com.android.tools.r8.synthesis.SyntheticClasspathClassBuilder) -> a
     void lambda$getMethodBridgeReference$6(com.android.tools.r8.graph.DexClasspathClass) -> a
     60:60:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78:78 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1821:1821 -> a
-    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():515 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1824:1824 -> a
+    61:61:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():518 -> a
     61:61:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):78 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     62:64:com.android.tools.r8.ir.desugar.nest.NestBasedAccessDesugaring create(com.android.tools.r8.graph.AppView):79:81 -> a
@@ -59558,7 +59562,7 @@
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):42:43 -> <init>
     1:2:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):34:35 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3:3:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):35 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:5:com.android.tools.r8.ir.desugar.records.RecordCfToCfRewriter create(com.android.tools.r8.graph.AppView):36:37 -> a
@@ -61223,7 +61227,7 @@
     25:25:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3460 -> i
     26:43:void rewriteKnownArrayLengthCalls(com.android.tools.r8.ir.code.IRCode):3461:3478 -> i
     1:1:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1337:1337 -> j
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> j
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> j
     2:2:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1337 -> j
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:7:boolean rewriteMoveResult(com.android.tools.r8.ir.code.IRCode):1337:1341 -> j
@@ -61250,7 +61254,7 @@
     1:1:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957:957 -> k
     2:2:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):961:961 -> k
     2:2:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957 -> k
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1882:1882 -> k
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isSwitchRewritingEnabled():1885:1885 -> k
     3:3:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):961 -> k
     3:3:boolean rewriteSwitch(com.android.tools.r8.ir.code.IRCode):957 -> k
     4:4:boolean com.android.tools.r8.ir.optimize.CodeRewriter.rewriteSwitch(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.optimize.controlflow.SwitchCaseAnalyzer):964:964 -> k
@@ -61321,7 +61325,7 @@
     75:76:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1982 -> n
     77:86:void shortenLiveRanges(com.android.tools.r8.ir.code.IRCode):1996:2005 -> n
     1:1:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2233:2233 -> o
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> o
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> o
     2:2:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2233 -> o
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3:11:void simplifyArrayConstruction(com.android.tools.r8.ir.code.IRCode):2236:2244 -> o
@@ -61813,7 +61817,7 @@
     481:481:boolean com.android.tools.r8.ir.optimize.DefaultInliningOracle.isSingleTargetInvalid(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):103:103 -> a
     481:481:com.android.tools.r8.ir.optimize.Inliner$InlineResult computeInlining(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.analysis.ClassInitializationAnalysis,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):265 -> a
     488:496:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):133:141 -> a
-    497:497:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    497:497:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     497:497:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):141 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     498:502:boolean passesInliningConstraints(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.MethodResolutionResult$SingleResolutionResult,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.Inliner$Reason,com.android.tools.r8.ir.optimize.inliner.WhyAreYouNotInliningReporter):143:147 -> a
@@ -62227,7 +62231,7 @@
     32:32:boolean com.android.tools.r8.graph.DexEncodedMethod.isSynchronized():444:444 -> a
     32:32:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):582 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     33:33:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):582 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     34:36:com.android.tools.r8.ir.optimize.Inliner$InlineeWithReason buildInliningIR(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.ir.optimize.inliner.InliningIRProvider,com.android.tools.r8.ir.conversion.LensCodeRewriter):583:585 -> a
@@ -62751,8 +62755,8 @@
     com.android.tools.r8.graph.AppView appView -> a
     1:2:void <init>(com.android.tools.r8.graph.AppView):35:36 -> <init>
     1:2:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):40:41 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1821:1821 -> a
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():515 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.canUseNestBasedAccess():1824:1824 -> a
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.shouldDesugarNests():518 -> a
     3:3:void run(java.util.concurrent.ExecutorService,com.android.tools.r8.utils.Timing):41 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4:9:void com.android.tools.r8.ir.optimize.NestReducer.removeNests():50:55 -> a
@@ -62853,7 +62857,7 @@
     123:123:com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext lambda$buildOutlineMethods$6(com.android.tools.r8.contexts.CompilationContext$ProcessorContext,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.DexMethod):1514:1514 -> a
     124:124:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1525:1525 -> a
     125:134:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1524:1533 -> a
-    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    135:135:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     135:135:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1533 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     136:136:void lambda$buildOutlineMethods$8(com.android.tools.r8.ir.optimize.OutlinerImpl$Outline,com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.synthesis.SyntheticMethodBuilder):1535:1535 -> a
@@ -63321,7 +63325,7 @@
     261:290:void candidate(int,int):1127:1156 -> a
     291:301:void reset(int):1161:1171 -> a
     1:7:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):972:978 -> b
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     8:8:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):978 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     9:15:boolean supportedArgumentType(com.android.tools.r8.ir.code.Value):981:987 -> b
@@ -63940,7 +63944,7 @@
     184:184:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111 -> a
     185:206:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):111:132 -> a
     207:221:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):131:145 -> a
-    222:222:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    222:222:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     222:222:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):145 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     223:225:void lambda$rewriteSingleGetClassOrForNameToConstClass$1(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.InstructionListIterator,java.util.Set,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexClass):146:148 -> a
@@ -63962,7 +63966,7 @@
     32:94:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):114:176 -> a
     95:108:void rewrite(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext):175:188 -> a
     109:110:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):179:180 -> a
-    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    111:111:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     111:111:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):180 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     112:112:com.android.tools.r8.graph.DexEncodedMethod lambda$rewrite$0(java.util.List,com.android.tools.r8.contexts.CompilationContext$MethodProcessingContext,com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexType):182:182 -> a
@@ -64269,7 +64273,7 @@
     15:24:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):71:80 -> a
     25:54:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):111:140 -> a
     25:54:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    55:55:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     55:55:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):140 -> a
     55:55:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     56:56:boolean com.android.tools.r8.ir.code.Instruction.isInstanceGet():0:0 -> a
@@ -64282,7 +64286,7 @@
     60:67:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     68:69:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):129:130 -> a
     68:69:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
-    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    70:70:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     70:70:int com.android.tools.r8.ir.optimize.classinliner.ClassInlinerCostAnalysis.estimateSizeOfNonMaterializingInstructions(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.IRCode):130 -> a
     70:70:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):81 -> a
     71:71:boolean willExceedInstructionBudget(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.graph.DexProgramClass,java.util.Map,java.util.List):82:82 -> a
@@ -66610,7 +66614,7 @@
     69:69:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
     70:71:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):308:309 -> a
     70:71:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
-    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1550:1550 -> a
+    72:72:boolean com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions.enableRemoveProtoEnumSwitchMap():1553:1553 -> a
     72:72:com.android.tools.r8.it.unimi.dsi.fastutil.ints.Int2IntArrayMap com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer.computeOrdinalToTargetMap(com.android.tools.r8.ir.code.IRCode,com.android.tools.r8.ir.code.IntSwitch,com.android.tools.r8.ir.optimize.enums.EnumValueOptimizer$EnumSwitchInfo):309 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     72:72:void removeSwitchMaps(com.android.tools.r8.ir.code.IRCode):205 -> a
@@ -70667,7 +70671,7 @@
     3545:3553:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2400:2408 -> a
     3554:3554:void blockLinkedRegisters(java.util.List,com.android.tools.r8.ir.regalloc.LiveIntervals,int,com.android.tools.r8.ir.regalloc.RegisterPositions,com.android.tools.r8.ir.regalloc.RegisterPositions):2407:2407 -> a
     3555:3590:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2516:2551 -> a
-    3591:3591:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3591:3591:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3591:3591:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     3591:3591:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551 -> a
     3592:3598:void addLiveRange(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,int,java.util.List,com.android.tools.r8.utils.InternalOptions):2551:2557 -> a
@@ -70689,11 +70693,11 @@
     3619:3619:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2615 -> a
     3620:3647:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2616:2643 -> a
     3648:3654:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2640:2646 -> a
-    3655:3655:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3655:3655:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3655:3655:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3656:3663:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2646:2653 -> a
-    3664:3664:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3664:3664:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3664:3664:boolean unconstrainedForCf(int,com.android.tools.r8.utils.InternalOptions):2727 -> a
     3664:3664:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653 -> a
     3665:3702:void computeLiveRanges(com.android.tools.r8.utils.InternalOptions,com.android.tools.r8.ir.code.IRCode,java.util.Map,java.util.List):2653:2690 -> a
@@ -79552,7 +79556,7 @@
     256:259:int compareMethodsThroughLens(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.graph.ProgramMethod):310:313 -> a
     260:260:com.android.tools.r8.graph.DexType[] lambda$compareMethodsThroughLens$3(com.android.tools.r8.graph.DexMethod):311:311 -> a
     261:264:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):317:320 -> a
-    265:265:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    265:265:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     265:265:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     266:266:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
@@ -79562,18 +79566,18 @@
     612:612:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
     613:613:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):320:320 -> a
     588:589:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):321:322 -> a
-    590:594:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1915:1919 -> a
+    590:594:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1918:1922 -> a
     590:594:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     595:595:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    595:595:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1920 -> a
+    595:595:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1923 -> a
     595:595:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):323 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     596:601:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):322:327 -> a
-    602:606:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1915:1919 -> a
+    602:606:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1918:1922 -> a
     602:606:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
     607:607:com.android.tools.r8.utils.structural.Ordered com.android.tools.r8.utils.structural.Ordered.min(com.android.tools.r8.utils.structural.Ordered,com.android.tools.r8.utils.structural.Ordered):21:21 -> a
-    607:607:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1920 -> a
+    607:607:com.android.tools.r8.cf.CfVersion com.android.tools.r8.utils.InternalOptions.classFileVersionAfterDesugaring(com.android.tools.r8.cf.CfVersion):1923 -> a
     607:607:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):327 -> a
     608:610:com.android.tools.r8.cf.CfVersion getClassFileVersion(com.android.tools.r8.graph.DexEncodedMethod):328:330 -> a
     614:621:com.android.tools.r8.graph.DexValue getSystemAnnotationValue(com.android.tools.r8.graph.DexAnnotationSet,com.android.tools.r8.graph.DexType):348:355 -> a
@@ -90173,7 +90177,7 @@
     2:2:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):114 -> a
     3:6:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):115:118 -> a
     7:11:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):117:121 -> a
-    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):88:88 -> a
+    12:12:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):89:89 -> a
     12:12:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):121 -> a
     13:41:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):121:149 -> a
     42:48:void com.android.tools.r8.kotlin.KotlinClassInfo.setCompanionObject(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.utils.Reporter):233:239 -> a
@@ -90200,21 +90204,21 @@
     60:60:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinClassInfo.getAnonymousObjectOrigin(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass,com.android.tools.r8.graph.DexItemFactory):194:194 -> a
     60:60:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):159 -> a
     61:64:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):160:163 -> a
-    65:73:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):207:215 -> a
+    65:73:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):216:224 -> a
     65:73:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):162 -> a
     74:74:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":122,"2":123,"3":124}}
-    122:122:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    122:122:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    122:122:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    122:122:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     122:122:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):162 -> a
-    123:123:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    123:123:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    123:123:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    123:123:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     123:123:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):162 -> a
-    124:124:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    124:124:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    124:124:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    124:124:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     124:124:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):162 -> a
-    75:75:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    75:75:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    75:75:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    75:75:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     75:75:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):162 -> a
     76:82:com.android.tools.r8.kotlin.KotlinClassInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.KotlinClassMetadata$Class,java.lang.String,int[],com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer):161:167 -> a
     83:83:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmClassExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass):13:13 -> a
@@ -90254,21 +90258,21 @@
     642:642:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):279:279 -> a
     643:643:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):279:279 -> a
     464:469:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):279:284 -> a
-    470:478:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):207:215 -> a
+    470:478:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):216:224 -> a
     470:478:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):284 -> a
     479:479:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":644,"2":645,"3":646}}
-    644:644:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    644:644:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    644:644:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    644:644:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     644:644:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):284 -> a
-    645:645:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    645:645:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    645:645:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    645:645:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     645:645:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):284 -> a
-    646:646:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    646:646:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    646:646:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    646:646:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     646:646:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):284 -> a
-    480:480:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
-    480:480:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):211 -> a
+    480:480:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
+    480:480:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinClassName(com.android.tools.r8.graph.DexClass,java.lang.String):220 -> a
     480:480:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):284 -> a
     481:525:void com.android.tools.r8.jetbrains.kotlinx.metadata.KmClass.setName(java.lang.String):0:44 -> a
     481:525:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):286 -> a
@@ -90440,13 +90444,13 @@
     2:2:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):73:73 -> a
     3:3:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):0:0 -> a
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8,"2":9,"3":10}}
-    8:8:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
+    8:8:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
     8:8:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):74 -> a
-    9:9:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
+    9:9:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
     9:9:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):74 -> a
-    10:10:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> a
+    10:10:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> a
     10:10:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):74 -> a
-    4:6:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:226 -> a
+    4:6:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:235 -> a
     4:6:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):74 -> a
     7:7:void lambda$rewrite$0(com.android.tools.r8.jetbrains.kotlinx.metadata.KmTypeVisitor,java.lang.String):73:73 -> a
     11:11:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):83:83 -> a
@@ -90519,55 +90523,63 @@
     java.util.List typeAliases -> a
     java.util.List propertiesWithNoBacking -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():34:34 -> <clinit>
-    1:4:void <init>(java.util.List,java.util.List,java.util.List):46:49 -> <init>
-    1:3:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):61:63 -> a
+    1:1:void <clinit>():37:37 -> <clinit>
+    1:4:void <init>(java.util.List,java.util.List,java.util.List):49:52 -> <init>
+    1:3:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):64:66 -> a
     4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):0:0 -> a
-    4:4:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):64 -> a
+    4:4:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):67 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmFunctionExtension com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmExtensionNodesKt.getJvm(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):19:19 -> a
     5:5:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80 -> a
-    5:5:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):64 -> a
+    5:5:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):67 -> a
     6:6:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.KmFunction):80:80 -> a
-    6:6:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):64 -> a
-    7:15:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):66:74 -> a
-    16:24:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):70:78 -> a
-    25:27:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):151:153 -> a
-    25:27:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):78 -> a
-    28:28:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):90:90 -> a
-    29:30:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):142:143 -> a
-    29:30:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):90 -> a
-    31:55:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):91:115 -> a
-    56:57:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):149:150 -> a
-    56:57:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):115 -> a
-    58:67:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):116:125 -> a
-    68:69:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):149:150 -> a
-    68:69:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):125 -> a
-    70:79:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):126:135 -> a
-    80:84:java.util.List com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):156:160 -> a
-    80:84:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):135 -> a
-    85:86:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):136:137 -> a
-    87:96:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):173:182 -> a
-    97:134:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):181:218 -> a
-    135:149:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):214:228 -> a
-    150:150:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):182:182 -> a
-    151:151:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeAliasInfo):235:235 -> a
-    152:154:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):235:237 -> a
-    155:155:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):236:236 -> a
-    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):203:203 -> b
-    1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):237:237 -> c
+    6:6:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):67 -> a
+    7:15:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):69:77 -> a
+    16:24:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):73:81 -> a
+    25:27:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):160:162 -> a
+    25:27:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):81 -> a
+    28:28:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):93:93 -> a
+    29:33:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):149:153 -> a
+    29:33:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):93 -> a
+    34:38:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toDefaultJvmMethodSignature(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,int):105:109 -> a
+    34:38:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):156 -> a
+    34:38:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):93 -> a
+    39:39:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMemberSignature.toString():30:30 -> a
+    39:39:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):156 -> a
+    39:39:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):93 -> a
+    40:46:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfInline(int,com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,java.util.Map,java.util.function.Consumer):156:162 -> a
+    40:46:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):93 -> a
+    47:71:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):94:118 -> a
+    72:73:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):168:169 -> a
+    72:73:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):118 -> a
+    74:83:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):119:128 -> a
+    84:85:void com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.keepIfAccessorInline(int,com.android.tools.r8.graph.DexEncodedMethod,java.util.function.Consumer):168:169 -> a
+    84:85:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):128 -> a
+    86:95:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):129:138 -> a
+    96:100:java.util.List com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo.getTypeAliases(java.util.List,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):175:179 -> a
+    96:100:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):138 -> a
+    101:102:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmDeclarationContainer,java.util.Map,java.util.Map,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):139:140 -> a
+    103:112:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):192:201 -> a
+    113:150:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):200:237 -> a
+    151:165:boolean rewrite(com.android.tools.r8.kotlin.KmVisitorProviders$KmFunctionVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmPropertyVisitorProvider,com.android.tools.r8.kotlin.KmVisitorProviders$KmTypeAliasVisitorProvider,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):233:247 -> a
+    166:166:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$0(com.android.tools.r8.kotlin.KotlinPropertyInfo):201:201 -> a
+    167:167:java.util.function.Consumer lambda$trace$2(com.android.tools.r8.kotlin.KotlinTypeAliasInfo):254:254 -> a
+    168:170:void trace(com.android.tools.r8.graph.DexDefinitionSupplier):254:256 -> a
+    171:171:java.util.function.Consumer lambda$trace$3(com.android.tools.r8.kotlin.KotlinFunctionInfo):255:255 -> a
+    1:1:com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup lambda$rewrite$1(com.android.tools.r8.kotlin.KotlinPropertyInfo):222:222 -> b
+    1:1:java.util.function.Consumer lambda$trace$4(com.android.tools.r8.kotlin.KotlinPropertyInfo):256:256 -> c
 com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup -> com.android.tools.r8.internal.Gz:
     com.android.tools.r8.graph.DexEncodedField backingField -> a
     com.android.tools.r8.graph.DexEncodedMethod getter -> c
     com.android.tools.r8.graph.DexEncodedMethod setter -> b
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():240:240 -> <clinit>
-    1:5:void <init>():240:244 -> <init>
-    1:1:com.android.tools.r8.graph.DexEncodedField access$000(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):240:240 -> a
-    2:3:void setBackingField(com.android.tools.r8.graph.DexEncodedField):247:248 -> a
-    4:5:void setGetter(com.android.tools.r8.graph.DexEncodedMethod):252:253 -> a
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):240:240 -> b
-    2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):257:258 -> b
-    1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):240:240 -> c
+    1:1:void <clinit>():259:259 -> <clinit>
+    1:5:void <init>():259:263 -> <init>
+    1:1:com.android.tools.r8.graph.DexEncodedField access$000(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> a
+    2:3:void setBackingField(com.android.tools.r8.graph.DexEncodedField):266:267 -> a
+    4:5:void setGetter(com.android.tools.r8.graph.DexEncodedMethod):271:272 -> a
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$100(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> b
+    2:3:void setSetter(com.android.tools.r8.graph.DexEncodedMethod):276:277 -> b
+    1:1:com.android.tools.r8.graph.DexEncodedMethod access$200(com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo$KotlinPropertyGroup):259:259 -> c
 com.android.tools.r8.kotlin.KotlinEffectExpressionInfo -> com.android.tools.r8.internal.Iz:
     java.util.List orArguments -> f
     com.android.tools.r8.kotlin.KotlinTypeInfo isInstanceType -> d
@@ -90679,7 +90691,7 @@
     1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinTypeReference,java.util.List):35:39 -> <init>
     6:10:void <init>(java.lang.String,java.lang.String):42:46 -> <init>
     1:2:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):54:55 -> a
-    3:5:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):151:153 -> a
+    3:5:boolean com.android.tools.r8.kotlin.KotlinMetadataUtils.isValidMethodDescriptor(java.lang.String):160:162 -> a
     3:5:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):56 -> a
     6:8:com.android.tools.r8.kotlin.KotlinJvmMethodSignatureInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.graph.DexItemFactory):58:60 -> a
     9:9:com.android.tools.r8.kotlin.KotlinTypeReference com.android.tools.r8.kotlin.KotlinTypeReference.fromDescriptor(java.lang.String,com.android.tools.r8.graph.DexItemFactory):60:60 -> a
@@ -91037,59 +91049,59 @@
 com.android.tools.r8.kotlin.KotlinMetadataUtils -> com.android.tools.r8.internal.jA:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo NO_KOTLIN_INFO -> a
     com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo INVALID_KOTLIN_INFO -> b
-    1:2:void <clinit>():35:36 -> <clinit>
+    1:2:void <clinit>():36:37 -> <clinit>
     1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":101,"2":102,"3":103}}
-    101:101:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> a
-    102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):92:92 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":102,"2":103,"3":104}}
+    102:102:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):93:93 -> a
     103:103:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):93:93 -> a
-    95:100:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):94:99 -> a
-    104:104:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getInvalidKotlinInfo():84:84 -> a
-    105:113:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):168:176 -> a
-    114:114:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):186:186 -> a
-    115:115:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
-    115:115:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):186 -> a
-    116:116:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):188:188 -> a
-    117:117:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
-    117:117:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):190 -> a
-    118:128:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):193:203 -> a
-    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():80:80 -> b
+    104:104:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):94:94 -> a
+    96:101:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature toJvmMethodSignature(com.android.tools.r8.graph.DexMethod):95:100 -> a
+    105:105:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getInvalidKotlinInfo():85:85 -> a
+    106:114:boolean mayProcessKotlinMetadata(com.android.tools.r8.graph.AppView):177:185 -> a
+    115:115:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):195:195 -> a
+    116:116:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardIfRule():0:0 -> a
+    116:116:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):195 -> a
+    117:117:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):197:197 -> a
+    118:118:boolean com.android.tools.r8.shaking.ProguardConfigurationRule.isProguardKeepRule():0:0 -> a
+    118:118:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):199 -> a
+    119:129:boolean canBeKotlinMetadataKeepRule(com.android.tools.r8.shaking.ProguardConfigurationRule,com.android.tools.r8.graph.DexItemFactory):202:212 -> a
+    1:1:com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo getNoKotlinInfo():81:81 -> b
 com.android.tools.r8.kotlin.KotlinMetadataUtils$1 -> com.android.tools.r8.internal.eA:
 com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor -> com.android.tools.r8.internal.hA:
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature -> a
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature -> b
     com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature -> c
-    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):109:109 -> <init>
-    2:9:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):103:110 -> <init>
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$100(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):102:102 -> a
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$102(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):102:102 -> a
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$202(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):102:102 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature():137:137 -> a
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$200(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):102:102 -> b
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$302(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):102:102 -> b
-    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():141:141 -> b
-    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):102:102 -> c
-    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():145:145 -> c
+    1:1:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):118:118 -> <init>
+    2:8:void <init>(com.android.tools.r8.jetbrains.kotlinx.metadata.KmProperty):113:119 -> <init>
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$100(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):112:112 -> a
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature access$102(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature):112:112 -> a
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$202(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):112:112 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature fieldSignature():146:146 -> a
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$200(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):112:112 -> b
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$302(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):112:112 -> b
+    3:3:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature getterSignature():150:150 -> b
+    1:1:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature access$300(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):112:112 -> c
+    2:2:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature setterSignature():154:154 -> c
 com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 -> com.android.tools.r8.internal.gA:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor this$0 -> b
-    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):111:111 -> <init>
-    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):114:117 -> a
+    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor):120:120 -> <init>
+    1:4:com.android.tools.r8.jetbrains.kotlinx.metadata.KmPropertyExtensionVisitor visitExtensions(com.android.tools.r8.jetbrains.kotlinx.metadata.KmExtensionType):123:126 -> a
 com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1$1 -> com.android.tools.r8.internal.fA:
     com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1 this$1 -> c
     boolean $assertionsDisabled -> d
-    1:1:void <clinit>():117:117 -> <clinit>
-    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):117:117 -> <init>
-    1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):124:129 -> a
+    1:1:void <clinit>():126:126 -> <clinit>
+    1:1:void <init>(com.android.tools.r8.kotlin.KotlinMetadataUtils$KmPropertyProcessor$1):126:126 -> <init>
+    1:6:void visit(int,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature,com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmMethodSignature):133:138 -> a
 com.android.tools.r8.kotlin.KotlinMetadataUtils$NoKotlinInfo -> com.android.tools.r8.internal.iA:
     java.lang.String name -> a
-    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):38:38 -> <init>
-    2:3:void <init>(java.lang.String):43:44 -> <init>
+    1:1:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinMetadataUtils$1):39:39 -> <init>
+    2:3:void <init>(java.lang.String):44:45 -> <init>
     boolean isNoKotlinInformation() -> a
     void trace(com.android.tools.r8.graph.DexDefinitionSupplier) -> a
-    1:1:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):55:55 -> a
-    1:1:java.lang.String getPackageName():60:60 -> j
-    1:1:int[] getMetadataVersion():65:65 -> m
-    1:1:java.lang.String toString():49:49 -> toString
+    1:1:com.android.tools.r8.utils.Pair rewrite(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,com.android.tools.r8.naming.NamingLens):56:56 -> a
+    1:1:java.lang.String getPackageName():61:61 -> j
+    1:1:int[] getMetadataVersion():66:66 -> m
+    1:1:java.lang.String toString():50:50 -> toString
 com.android.tools.r8.kotlin.KotlinMetadataWriter -> com.android.tools.r8.internal.kA:
     boolean $assertionsDisabled -> a
     1:1:void <clinit>():47:47 -> <clinit>
@@ -91450,7 +91462,7 @@
     com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo localDelegatedProperties -> c
     1:5:void <init>(java.lang.String,com.android.tools.r8.kotlin.KotlinDeclarationContainerInfo,com.android.tools.r8.kotlin.KotlinLocalDelegatedPropertyInfo,com.android.tools.r8.kotlin.KotlinMetadataMembersTracker):36:40 -> <init>
     1:3:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):49:51 -> a
-    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):88:88 -> a
+    4:4:com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmFieldSignature com.android.tools.r8.kotlin.KotlinMetadataUtils.toJvmFieldSignature(com.android.tools.r8.graph.DexField):89:89 -> a
     4:4:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):51 -> a
     5:13:com.android.tools.r8.kotlin.KotlinPackageInfo create(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.AppView,java.util.function.Consumer,com.android.tools.r8.kotlin.KotlinJvmSignatureExtensionInformation):51:59 -> a
     14:14:java.lang.String com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.JvmExtensionsKt.getModuleName(com.android.tools.r8.jetbrains.kotlinx.metadata.KmPackage):0:0 -> a
@@ -91833,13 +91845,13 @@
     1:5:java.lang.String toKotlinClassifier(boolean):100:104 -> o
     6:6:java.lang.String toKotlinClassifier(boolean):0:0 -> o
       # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":8,"2":9,"3":10}}
-    8:8:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> o
+    8:8:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     8:8:java.lang.String toKotlinClassifier(boolean):103 -> o
-    9:9:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> o
+    9:9:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     9:9:java.lang.String toKotlinClassifier(boolean):103 -> o
-    10:10:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> o
+    10:10:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     10:10:java.lang.String toKotlinClassifier(boolean):103 -> o
-    7:7:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):224:224 -> o
+    7:7:java.lang.String com.android.tools.r8.kotlin.KotlinMetadataUtils.getKotlinLocalOrAnonymousNameFromDescriptor(java.lang.String,boolean):233:233 -> o
     7:7:java.lang.String toKotlinClassifier(boolean):103 -> o
     1:1:java.lang.String toString():152:152 -> toString
 com.android.tools.r8.kotlin.KotlinValueParameterInfo -> com.android.tools.r8.internal.BA:
@@ -92988,7 +93000,7 @@
     2:2:com.android.tools.r8.naming.MethodNamingState access$200(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType):92:92 -> a
     3:3:com.android.tools.r8.naming.MethodReservationState access$400(com.android.tools.r8.naming.MethodNameMinifier,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,com.android.tools.r8.naming.MethodReservationState):92:92 -> a
     4:4:java.util.function.Function getNamingKeyTransform():168:168 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     5:5:java.util.function.Function getNamingKeyTransform():168 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:7:java.util.function.Function getNamingKeyTransform():169:170 -> a
@@ -93043,7 +93055,7 @@
     701:701:boolean lambda$renameNonReboundMethodReference$6(com.android.tools.r8.graph.DexString,com.android.tools.r8.graph.DexEncodedMethod):386:386 -> a
     1:1:com.android.tools.r8.com.google.common.collect.BiMap access$100(com.android.tools.r8.naming.MethodNameMinifier):92:92 -> b
     2:3:java.util.function.Function getReservationKeyTransform():157:158 -> b
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     4:4:java.util.function.Function getReservationKeyTransform():158 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     5:8:java.util.function.Function getReservationKeyTransform():160:163 -> b
@@ -93790,7 +93802,7 @@
     13:15:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     19:21:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):119:121 -> a
     19:21:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
-    22:24:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1745:1747 -> a
+    22:24:com.android.tools.r8.naming.MapVersion com.android.tools.r8.utils.InternalOptions.getMapFileVersion():1748:1750 -> a
     22:24:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):121 -> a
     22:24:com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId writeProguardMap():82 -> a
     25:29:void com.android.tools.r8.naming.ProguardMapSupplier.writeMarker(com.android.tools.r8.naming.ProguardMapSupplier$ProguardMapId):122:126 -> a
@@ -94131,7 +94143,7 @@
     2:2:java.lang.String lambda$internalComputeNameFor$0(int):62:62 -> a
 com.android.tools.r8.naming.identifiernamestring.ClassForNameIdentifierNameStringLookupResult -> com.android.tools.r8.internal.Q9:
     1:1:void <init>(com.android.tools.r8.graph.DexType):14:14 -> <init>
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
     1:1:boolean isTypeCompatInstantiatedFromUse(com.android.tools.r8.utils.InternalOptions):24 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     boolean isTypeInitializedFromUse() -> d
@@ -94925,7 +94937,7 @@
     189:203:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):250:264 -> a
     204:204:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):326:326 -> a
     204:204:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):271 -> a
-    205:205:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    205:205:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     205:205:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):326 -> a
     205:205:void lambda$computeMethodRebinding$4(java.util.function.Function,com.android.tools.r8.ir.code.Invoke$Type,com.android.tools.r8.utils.TriConsumer,com.android.tools.r8.graph.DexMethod,com.android.tools.r8.utils.collections.ProgramMethodSet):271 -> a
     206:209:boolean com.android.tools.r8.optimize.MemberRebindingAnalysis.needsBridgeForInterfaceMethod(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClassAndMethod,com.android.tools.r8.ir.code.Invoke$Type):326:329 -> a
@@ -101690,7 +101702,7 @@
     41:41:void com.android.tools.r8.graph.AppView.rewriteWithLensAndApplication(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.graph.DirectMappedDexApplication):738:738 -> a
     41:41:boolean verifyIdentityRepackaging(com.android.tools.r8.graph.AppView):123 -> a
     42:42:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130:130 -> a
-    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1203:1203 -> a
+    43:43:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1206:1206 -> a
     43:43:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):130 -> a
     44:48:com.android.tools.r8.repackaging.RepackagingLens run(com.android.tools.r8.graph.DirectMappedDexApplication$Builder,java.util.concurrent.ExecutorService):134:138 -> a
     49:63:void com.android.tools.r8.repackaging.Repackaging.processPackagesInDesiredLocation(com.android.tools.r8.graph.ProgramPackageCollection,com.android.tools.r8.com.google.common.collect.BiMap,java.util.Map,java.util.Set):202:216 -> a
@@ -101732,23 +101744,23 @@
     1:1:void <clinit>():328:328 -> <clinit>
     1:6:void <init>(com.android.tools.r8.graph.AppView):336:341 -> <init>
     1:5:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):346:350 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1211:1211 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1214:1214 -> a
     6:6:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):350 -> a
-    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1215:1215 -> a
+    7:7:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1218:1218 -> a
     7:7:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):352 -> a
     8:14:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):354:360 -> a
     15:20:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):357:362 -> a
-    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1207:1207 -> a
+    21:21:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1210:1210 -> a
     21:21:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362 -> a
     22:27:java.lang.String getNewPackageDescriptor(com.android.tools.r8.graph.ProgramPackage,java.util.Set):362:367 -> a
     28:32:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):373:377 -> a
-    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1211:1211 -> a
+    33:33:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isRepackageClasses():1214:1214 -> a
     33:33:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):377 -> a
     34:34:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):378:378 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1215:1215 -> a
+    35:35:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isMinification():1218:1218 -> a
     35:35:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):379 -> a
     36:40:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):381:385 -> a
-    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1207:1207 -> a
+    41:41:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isFlattenPackageHierarchy():1210:1210 -> a
     41:41:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385 -> a
     42:42:boolean isPackageInTargetLocation(com.android.tools.r8.graph.ProgramPackage):385:385 -> a
     43:54:com.android.tools.r8.graph.DexType getRepackagedType(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.DexProgramClass,java.lang.String,com.android.tools.r8.com.google.common.collect.BiMap):423:434 -> a
@@ -101891,7 +101903,7 @@
     43:49:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
     50:56:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):77:83 -> a
     50:56:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
-    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    57:57:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     57:57:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84 -> a
     57:57:void registerMemberAccess(com.android.tools.r8.graph.MemberResolutionResult,boolean):151 -> a
     58:61:boolean com.android.tools.r8.repackaging.RepackagingUseRegistry.isOnlyAccessibleFromSamePackage(com.android.tools.r8.graph.SuccessfulMemberResolutionResult,boolean):84:87 -> a
@@ -103717,7 +103729,7 @@
     436:436:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342:342 -> a
     437:437:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):184:184 -> a
     437:437:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
-    438:438:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    438:438:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
     438:438:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):187 -> a
     438:438:boolean lambda$stripAttributes$8(com.android.tools.r8.shaking.KeepClassInfo,com.android.tools.r8.graph.EnclosingMethodAttribute):342 -> a
     439:439:boolean com.android.tools.r8.shaking.KeepInfo.isEnclosingMethodAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute,com.android.tools.r8.graph.AppView):190:190 -> a
@@ -103734,7 +103746,7 @@
     452:453:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):366:367 -> a
     454:454:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):203:203 -> a
     454:454:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
-    455:455:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
+    455:455:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
     455:455:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):206 -> a
     455:455:boolean canRemoveInnerClassAttribute(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.InnerClassAttribute,com.android.tools.r8.graph.EnclosingMethodAttribute):367 -> a
     456:456:boolean com.android.tools.r8.shaking.KeepInfo.isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration,com.android.tools.r8.graph.EnclosingMethodAttribute):211:211 -> a
@@ -103870,16 +103882,16 @@
     26:29:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):442:445 -> a
     30:30:java.util.Set pruneItems(java.util.Set,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):444:444 -> a
     31:34:void lambda$pruneItems$2(java.util.Set,java.util.Set):447:450 -> a
-    35:35:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    35:35:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):702 -> a
+    35:46:void lambda$pruneMapFromMembers$4(com.android.tools.r8.graph.PrunedItems,java.util.Map):475:486 -> a
+    47:47:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    47:47:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):702 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    36:37:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):705:706 -> a
-    38:49:void computeLargestCfVersion():712:712 -> a
-    38:49:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
-    59:59:void computeLargestCfVersion():722:722 -> a
-    59:59:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
-    60:60:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):708:708 -> a
-    61:72:void lambda$pruneMapFromMembers$4(com.android.tools.r8.graph.PrunedItems,java.util.Map):475:486 -> a
+    48:49:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):705:706 -> a
+    50:61:void computeLargestCfVersion():712:712 -> a
+    50:61:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
+    71:71:void computeLargestCfVersion():722:722 -> a
+    71:71:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):706 -> a
+    72:72:boolean canUseConstClassInstructions(com.android.tools.r8.utils.InternalOptions):708:708 -> a
     73:75:boolean lambda$pruneMapFromMembers$3(java.util.Set,java.util.Set,com.android.tools.r8.graph.DexMember):481:483 -> a
     76:87:void lambda$pruneMapFromMembers$6(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.it.unimi.dsi.fastutil.objects.Object2BooleanMap):503:514 -> a
     88:90:java.util.Map pruneMap(java.util.Map,java.util.Set,java.util.concurrent.ExecutorService,java.util.List):527:529 -> a
@@ -103922,7 +103934,7 @@
     1235:1239:boolean isFieldOnlyWrittenInMethod(com.android.tools.r8.graph.DexEncodedField,com.android.tools.r8.graph.DexEncodedMethod):1044:1048 -> a
     1243:1243:boolean isClassInliningAllowed(com.android.tools.r8.graph.DexProgramClass):1151:1151 -> a
     1244:1244:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155:1155 -> a
-    1245:1245:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    1245:1245:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     1245:1245:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1246:1247:boolean isMinificationAllowed(com.android.tools.r8.graph.DexReference):1155:1156 -> a
@@ -104814,7 +104826,7 @@
     3250:3251:boolean registerReflectiveFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod):958:959 -> a
     3252:3283:boolean registerFieldAccess(com.android.tools.r8.graph.DexField,com.android.tools.r8.graph.ProgramMethod,boolean,boolean):965:996 -> a
     3284:3284:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002:1002 -> a
-    3285:3285:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    3285:3285:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     3285:3285:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     3286:3286:void traceCallSite(com.android.tools.r8.graph.DexCallSite,com.android.tools.r8.graph.ProgramMethod):1002:1002 -> a
@@ -105132,7 +105144,7 @@
     7926:7928:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2303:2305 -> a
     7929:7929:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297:2297 -> a
     7929:7929:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2306 -> a
-    7930:7930:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    7930:7930:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     7930:7930:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297 -> a
     7930:7930:void keepClassAndAllMembers(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):2306 -> a
     7931:7931:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2298:2298 -> a
@@ -105144,7 +105156,7 @@
     7935:7935:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2309:2309 -> a
     7936:7936:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297:2297 -> a
     7936:7936:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2310 -> a
-    7937:7937:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    7937:7937:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     7937:7937:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297 -> a
     7937:7937:void lambda$keepClassAndAllMembers$46(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramField):2310 -> a
     7938:7938:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2298:2298 -> a
@@ -105153,7 +105165,7 @@
     7940:7940:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2315:2315 -> a
     7941:7941:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297:2297 -> a
     7941:7941:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2316 -> a
-    7942:7942:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    7942:7942:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     7942:7942:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297 -> a
     7942:7942:void lambda$keepClassAndAllMembers$47(com.android.tools.r8.shaking.GraphReporter$KeepReasonWitness,com.android.tools.r8.graph.ProgramMethod):2316 -> a
     7943:7943:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2298:2298 -> a
@@ -105921,7 +105933,7 @@
     1815:1820:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3088:3093 -> b
     1821:1821:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297:2297 -> b
     1821:1821:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3096 -> b
-    1822:1822:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> b
+    1822:1822:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> b
     1822:1822:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2297 -> b
     1822:1822:void markEnumValuesAsReachable(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.KeepReason):3096 -> b
     1823:1823:void shouldNotBeMinified(com.android.tools.r8.graph.ProgramDefinition):2298:2298 -> b
@@ -106392,7 +106404,7 @@
     boolean addProto(com.android.tools.r8.graph.DexProto) -> a
     boolean addString(com.android.tools.r8.graph.DexString) -> a
     1:24:boolean addField(com.android.tools.r8.graph.DexField):4861:4884 -> b
-    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> b
+    25:25:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> b
     25:25:boolean addField(com.android.tools.r8.graph.DexField):4884 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     26:31:boolean addField(com.android.tools.r8.graph.DexField):4884:4889 -> b
@@ -107235,7 +107247,7 @@
     3:3:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$1(com.android.tools.r8.graph.DexField):57:57 -> a
     4:4:com.android.tools.r8.shaking.KeepInfo$Joiner lambda$newEmptyJoinerFor$2(com.android.tools.r8.graph.DexMethod):58:58 -> a
     5:5:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165:165 -> a
-    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():686:687 -> a
+    6:7:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():689:690 -> a
     6:7:boolean isAccessModificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):165 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     8:8:boolean internalIsAccessModificationAllowed():170:170 -> a
@@ -107266,8 +107278,8 @@
     21:21:boolean isLessThanOrEquals(com.android.tools.r8.shaking.KeepInfo):226 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70:70 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> b
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():599 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> b
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():602 -> b
     2:2:boolean isAnnotationRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):70 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     3:3:boolean internalIsAnnotationRemovalAllowed():74:74 -> b
@@ -107275,19 +107287,19 @@
     4:4:boolean internalIsAccessModificationRequiredForRepackaging():153:153 -> b
     1:1:boolean internalIsAnnotationRemovalAllowed():74:74 -> c
     2:2:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):194:194 -> c
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> c
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> c
     3:3:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197 -> c
     4:4:boolean isInnerClassesAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):197:197 -> c
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> d
     2:2:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108:108 -> d
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> d
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> d
     3:3:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> d
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsMinificationAllowed():112:112 -> d
     4:4:boolean isMinificationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):108 -> d
     1:1:boolean internalIsMinificationAllowed():112:112 -> e
     2:2:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122:122 -> e
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> e
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> e
     3:3:boolean isOptimizationAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):122 -> e
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsOptimizationAllowed():126:126 -> e
@@ -107302,13 +107314,13 @@
     1:1:boolean internalIsCheckDiscardedEnabled():82:82 -> h
     1:1:boolean isCheckDiscardedEnabled(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):78 -> h
     2:2:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136:136 -> h
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():604:604 -> h
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.isTreeShakingEnabled():607:607 -> h
     3:3:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> h
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4:4:boolean internalIsShrinkingAllowed():140:140 -> h
     4:4:boolean isShrinkingAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):136 -> h
     1:1:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):174:174 -> i
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> i
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> i
     2:2:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177 -> i
     3:3:boolean isSignatureAttributeRemovalAllowed(com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):177:177 -> i
 com.android.tools.r8.shaking.KeepInfo$Builder -> com.android.tools.r8.shaking.w0:
@@ -111895,7 +111907,7 @@
     2917:2918:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1109 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2919:2924:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1110:1115 -> a
-    2925:2925:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    2925:2925:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     2925:2925:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     2926:2927:void includeDescriptor(com.android.tools.r8.graph.DexType,com.android.tools.r8.shaking.ProguardKeepRuleBase,com.android.tools.r8.shaking.EnqueuerEvent):1115:1116 -> a
@@ -111981,7 +111993,7 @@
     4442:4446:boolean isInterfaceMethodNeedingDesugaring(com.android.tools.r8.graph.ProgramDefinition):1530:1534 -> a
     4442:4446:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1443 -> a
     4447:4465:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1444:1462 -> a
-    4466:4466:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> a
+    4466:4466:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> a
     4466:4466:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1462 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4467:4469:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1462:1464 -> a
@@ -111997,7 +112009,7 @@
     4485:4485:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1475 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4486:4486:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1481:1481 -> a
-    4487:4488:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():686:687 -> a
+    4487:4488:boolean com.android.tools.r8.utils.InternalOptions.isAccessModificationEnabled():689:690 -> a
     4487:4488:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1481 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4489:4491:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1481:1483 -> a
@@ -112005,8 +112017,8 @@
     4492:4493:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1483 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4494:4498:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1484:1488 -> a
-    4499:4499:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():624:624 -> a
-    4499:4499:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():599 -> a
+    4499:4499:boolean com.android.tools.r8.utils.InternalOptions.isForceProguardCompatibilityEnabled():627:627 -> a
+    4499:4499:boolean com.android.tools.r8.utils.InternalOptions.isAnnotationRemovalEnabled():602 -> a
     4499:4499:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1488 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
     4500:4502:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1488:1490 -> a
@@ -112014,7 +112026,7 @@
     4503:4504:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1490 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4505:4509:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1491:1495 -> a
-    4510:4510:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    4510:4510:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     4510:4510:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1495 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4511:4513:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1495:1497 -> a
@@ -112022,7 +112034,7 @@
     4514:4515:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1497 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4516:4520:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1498:1502 -> a
-    4521:4521:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():614:614 -> a
+    4521:4521:boolean com.android.tools.r8.utils.InternalOptions.isOptimizationEnabled():617:617 -> a
     4521:4521:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1502 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     4522:4524:void evaluateKeepRule(com.android.tools.r8.graph.ProgramDefinition,com.android.tools.r8.shaking.ProguardKeepRule,com.android.tools.r8.shaking.ProguardMemberRule,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.shaking.ProguardIfRule):1502:1504 -> a
@@ -113237,59 +113249,59 @@
     169:169:void lambda$verifySyntheticInputsSubsetOfSynthetics$2(java.util.Set,com.android.tools.r8.graph.DexType):156:156 -> a
     162:162:void lambda$verifySyntheticInputsSubsetOfSynthetics$2(java.util.Set,com.android.tools.r8.graph.DexType):156:156 -> a
     170:170:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():162:162 -> a
-    171:176:boolean containsTypeOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):180:185 -> a
-    177:177:boolean containsNonLegacyType(com.android.tools.r8.graph.DexType):193:193 -> a
-    178:179:void forEachNonLegacyItem(java.util.function.Consumer):219:220 -> a
-    180:180:void lambda$forEachNonLegacyItem$3(java.util.function.Consumer,java.util.List):219:219 -> a
-    181:182:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):224:225 -> a
-    183:183:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():162:162 -> a
-    183:183:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):228 -> a
-    184:184:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):228:228 -> a
-    185:185:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():166:166 -> a
-    185:185:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):228 -> a
-    186:186:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):230:230 -> a
-    187:187:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
-    187:187:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):231 -> a
+    171:185:boolean containsTypeOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):180:194 -> a
+    186:186:boolean containsNonLegacyType(com.android.tools.r8.graph.DexType):202:202 -> a
+    187:188:void forEachNonLegacyItem(java.util.function.Consumer):228:229 -> a
+    189:189:void lambda$forEachNonLegacyItem$3(java.util.function.Consumer,java.util.List):228:228 -> a
+    190:191:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):233:234 -> a
+    192:192:com.android.tools.r8.synthesis.CommittedSyntheticsCollection empty():162:162 -> a
+    192:192:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237 -> a
+    193:193:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237:237 -> a
+    194:194:com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder builder():166:166 -> a
+    194:194:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):237 -> a
+    195:195:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239:239 -> a
+    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticMethodReference.getHolder():33:33 -> a
+    196:196:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    188:195:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):231:238 -> a
-    196:196:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
-    196:196:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239 -> a
+    197:204:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):240:247 -> a
+    205:205:com.android.tools.r8.graph.DexType com.android.tools.r8.synthesis.SyntheticClassReference.getHolder():31:31 -> a
+    205:205:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    197:210:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):239:252 -> a
-    211:215:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):256:260 -> a
-    216:217:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):267:268 -> a
-    218:218:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Iterable):157:157 -> a
-    218:218:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):268 -> a
-    219:230:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):268:279 -> a
-    231:233:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):283:285 -> a
-    234:235:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):290:291 -> a
-    236:236:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):0:0 -> a
-      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":528,"2":529,"3":530,"4":531,"5":532}}
-    528:528:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
-    529:529:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
-    530:530:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
-    531:531:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
-    532:532:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
-    527:527:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):291:291 -> a
+    206:219:com.android.tools.r8.synthesis.CommittedSyntheticsCollection pruneItems(com.android.tools.r8.graph.PrunedItems):248:261 -> a
+    220:224:com.android.tools.r8.synthesis.CommittedSyntheticsCollection rewriteWithLens(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):265:269 -> a
+    225:226:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):276:277 -> a
+    227:227:java.lang.Iterable com.android.tools.r8.utils.IterableUtils.flatten(java.lang.Iterable):157:157 -> a
+    227:227:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277 -> a
+    228:239:com.android.tools.r8.com.google.common.collect.ImmutableMap rewriteItems(java.util.Map,com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens,com.android.tools.r8.com.google.common.collect.ImmutableSet$Builder):277:288 -> a
+    240:242:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication):292:294 -> a
+    243:244:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):299:300 -> a
+    245:245:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):0:0 -> a
+      # {"id":"com.android.tools.r8.outlineCallsite","positions":{"1":546,"2":547,"3":548,"4":549,"5":550}}
+    546:546:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    547:547:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    548:548:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    549:549:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    550:550:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
+    545:545:boolean verifyTypesAreInApp(com.android.tools.r8.graph.DexApplication,java.util.Collection):300:300 -> a
     1:1:com.android.tools.r8.com.google.common.collect.ImmutableMap access$200(com.android.tools.r8.synthesis.CommittedSyntheticsCollection):31:31 -> b
     2:5:com.android.tools.r8.com.google.common.collect.ImmutableMap merge(java.util.Map,com.android.tools.r8.com.google.common.collect.ImmutableMap):119:122 -> b
-    6:6:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():205:205 -> b
-    7:8:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):209:210 -> b
+    6:6:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyClasses():214:214 -> b
+    7:8:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):218:219 -> b
     9:9:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> b
-    9:9:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):210 -> b
+    9:9:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):219 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    10:11:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):210:211 -> b
+    10:11:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):219:220 -> b
     12:12:java.lang.Object com.android.tools.r8.com.google.common.collect.ImmutableMap.getOrDefault(java.lang.Object,java.lang.Object):713:713 -> b
-    12:12:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):211 -> b
+    12:12:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):220 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    13:13:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):211:211 -> b
+    13:13:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):220:220 -> b
     14:14:java.lang.Iterable com.android.tools.r8.com.google.common.collect.Iterables.concat(java.lang.Iterable,java.lang.Iterable):418:418 -> b
-    14:14:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):209 -> b
-    15:15:void lambda$forEachNonLegacyItem$4(java.util.function.Consumer,java.util.List):220:220 -> b
+    14:14:java.lang.Iterable getNonLegacyItems(com.android.tools.r8.graph.DexType):218 -> b
+    15:15:void lambda$forEachNonLegacyItem$4(java.util.function.Consumer,java.util.List):229:229 -> b
     1:1:java.util.List lambda$merge$0(com.android.tools.r8.graph.DexType):121:121 -> c
-    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyMethods():201:201 -> c
+    2:2:com.android.tools.r8.com.google.common.collect.ImmutableMap getNonLegacyMethods():210:210 -> c
     1:2:boolean isEmpty():170:171 -> d
-    3:3:java.util.List lambda$rewriteItems$5(com.android.tools.r8.graph.DexType):272:272 -> d
+    3:3:java.util.List lambda$rewriteItems$5(com.android.tools.r8.graph.DexType):281:281 -> d
     1:5:boolean verifySyntheticInputsSubsetOfSynthetics():149:153 -> e
 com.android.tools.r8.synthesis.CommittedSyntheticsCollection$Builder -> com.android.tools.r8.synthesis.b:
     java.util.Map newNonLegacyClasses -> b
@@ -113354,7 +113366,7 @@
     27:27:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):116 -> a
     28:30:com.android.tools.r8.synthesis.SynthesizingContext rewrite(com.android.tools.r8.graph.GraphLens$NonIdentityGraphLens):118:120 -> a
     31:31:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128:128 -> a
-    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():438:438 -> a
+    32:32:boolean com.android.tools.r8.utils.InternalOptions.isDesugaredLibraryCompilation():441:441 -> a
     32:32:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):128 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     33:53:void registerPrefixRewriting(com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.AppView):131:151 -> a
@@ -113612,7 +113624,7 @@
     144:144:void lambda$computeFinalSynthetics$1(com.android.tools.r8.com.google.common.collect.ImmutableMap$Builder,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticMethodReference):235:235 -> a
     145:147:void lambda$computeFinalSynthetics$2(com.android.tools.r8.com.google.common.collect.ImmutableMap,com.android.tools.r8.com.google.common.collect.ImmutableMap,java.util.Set,com.android.tools.r8.synthesis.SyntheticReference):246:248 -> a
     148:148:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258:258 -> a
-    149:149:void com.android.tools.r8.synthesis.CommittedSyntheticsCollection.forEachSyntheticInput(java.util.function.Consumer):215:215 -> a
+    149:149:void com.android.tools.r8.synthesis.CommittedSyntheticsCollection.forEachSyntheticInput(java.util.function.Consumer):224:224 -> a
     149:149:void lambda$computeFinalSynthetics$4(com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,java.util.function.Consumer):258 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     150:150:void lambda$computeFinalSynthetics$3(java.util.function.Consumer,com.android.tools.r8.synthesis.SyntheticFinalization$SyntheticFinalizationGraphLens,com.android.tools.r8.graph.DexType):261:261 -> a
@@ -113672,7 +113684,7 @@
     843:843:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535:535 -> a
     844:844:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:82 -> a
     844:844:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
-    845:845:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    845:845:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     845:845:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82 -> a
     845:845:void addSyntheticMarker(com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):535 -> a
     846:851:void com.android.tools.r8.synthesis.SyntheticMarker.addMarkerToClass(com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind,com.android.tools.r8.utils.InternalOptions):82:87 -> a
@@ -113909,7 +113921,7 @@
     300:300:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):256:256 -> a
     301:301:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> a
     301:301:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
-    302:302:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):197:197 -> a
+    302:302:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):206:206 -> a
     302:302:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> a
     302:302:boolean isSubjectToKeepRules(com.android.tools.r8.graph.DexProgramClass):257 -> a
     303:303:boolean isSyntheticOfKind(com.android.tools.r8.graph.DexType,com.android.tools.r8.synthesis.SyntheticNaming$SyntheticKind):269:269 -> a
@@ -114160,7 +114172,7 @@
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     645:656:com.android.tools.r8.synthesis.CommittedItems commit(com.android.tools.r8.graph.PrunedItems,com.android.tools.r8.synthesis.SyntheticItems$PendingSynthetics,com.android.tools.r8.synthesis.CommittedSyntheticsCollection,int):793:804 -> a
     657:657:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):810:810 -> a
-    658:658:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    658:658:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     658:658:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):810 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     659:666:void writeAttributeIfIntermediateSyntheticClass(com.android.tools.r8.org.objectweb.asm.ClassWriter,com.android.tools.r8.graph.DexProgramClass,com.android.tools.r8.graph.AppView):813:820 -> a
@@ -114169,7 +114181,7 @@
     1:2:com.android.tools.r8.synthesis.CommittedItems createInitialSyntheticItems(com.android.tools.r8.graph.DexApplication):107:108 -> b
     3:3:java.util.Collection getPendingSyntheticClasses():206:206 -> b
     4:4:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273:273 -> b
-    5:5:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):197:197 -> b
+    5:5:boolean com.android.tools.r8.synthesis.CommittedSyntheticsCollection.containsSyntheticInput(com.android.tools.r8.graph.DexType):206:206 -> b
     5:5:boolean isSyntheticInput(com.android.tools.r8.graph.DexProgramClass):273 -> b
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     6:6:java.util.List getSynthesizingContexts(com.android.tools.r8.graph.DexType):314:314 -> b
@@ -117301,526 +117313,527 @@
     122:122:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96 -> getProgramResource
     123:123:com.android.tools.r8.ProgramResource getProgramResource(java.lang.String):96:96 -> getProgramResource
 com.android.tools.r8.utils.InternalOptions -> com.android.tools.r8.internal.gu:
-    boolean enableEnumValueOptimization -> P
     boolean printTimes -> i
-    boolean enableCfByteCodePassThrough -> b0
+    boolean ignoreMainDexMissingClasses -> b0
     com.android.tools.r8.features.FeatureSplitConfiguration featureSplitConfiguration -> f
     com.android.tools.r8.experimental.startup.StartupConfiguration startupConfiguration -> g
-    boolean useSmaliSyntax -> X
     boolean enableFieldBitAccessAnalysis -> q
-    java.util.Map warningInvalidParameterAnnotations -> U0
-    com.android.tools.r8.dex.Marker marker -> e0
-    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> C0
-    com.android.tools.r8.SourceFileProvider sourceFileProvider -> k1
+    java.util.Map missingEnclosingMembers -> U0
+    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> t0
     boolean enableInitializedClassesAnalysis -> y
-    com.android.tools.r8.MapIdProvider mapIdProvider -> j1
-    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> q1
-    boolean enableInheritanceClassInDexDistributor -> R0
-    boolean $assertionsDisabled -> s1
+    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> q1
+    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> N0
+    boolean minimalMainDex -> R0
     java.util.List outputInspections -> h
-    boolean skipIR -> E0
+    boolean configurationDebugging -> E0
     int callGraphLikelySpuriousCallEdgeThreshold -> L
     boolean forceAnnotateSynthetics -> I
-    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> S0
     boolean printMemory -> j
-    boolean reportMissingClassesInInnerClassAttributes -> A0
-    boolean enableEnumSwitchMapRemoval -> Q
+    boolean reportMissingClassesInEnclosingMethodAttribute -> A0
+    boolean enableEnumValueOptimization -> Q
     boolean enableVerticalClassMerging -> r
-    boolean reportMissingClassesInEnclosingMethodAttribute -> z0
-    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> I0
-    boolean enableMainDexListCheck -> v0
-    boolean invalidDebugInfoFatal -> Y
+    boolean ignoreMissingClasses -> z0
+    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> j0
+    java.util.List logArgumentsFilter -> o0
+    boolean lookupLibraryBeforeProgram -> v0
+    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> O0
+    java.util.Set reportedMissingForDesugaring -> m1
+    boolean useSmaliSyntax -> Y
+    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> n1
     boolean enableSideEffectAnalysis -> z
+    boolean enableNestReduction -> r0
     boolean cfToCfDesugar -> H
-    boolean intermediate -> j0
-    boolean enableStringSwitchConversion -> N
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> f1
+    boolean pruneNonVissibleAnnotationClasses -> n0
+    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> d1
+    boolean enableSwitchRewriting -> N
     java.lang.String dumpInputToDirectory -> l
-    boolean enableRedundantConstNumberOptimization -> V
-    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> O0
+    boolean enableCfByteCodePassThrough -> c0
+    boolean enableUninstantiatedTypeOptimizationForInterfaces -> V
     boolean enableClassInlining -> w
-    com.android.tools.r8.StringConsumer mainDexListConsumer -> X0
-    java.util.Map missingEnclosingMembers -> T0
-    com.android.tools.r8.utils.OffOrAuto tryWithResourcesDesugaring -> s0
-    com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelTestingOptions -> M0
-    boolean skipReadingDexCode -> W0
-    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> a1
-    com.android.tools.r8.cf.CfVersion SUPPORTED_CF_VERSION -> p1
-    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> e1
+    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> s0
+    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> S
+    com.android.tools.r8.StringConsumer usageInformationConsumer -> a1
+    boolean $assertionsDisabled -> t1
+    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> h0
+    boolean enableInheritanceClassInDexDistributor -> S0
     boolean enableTreeShakingOfLibraryMethodOverrides -> E
     com.android.tools.r8.ProgramConsumer programConsumer -> d
-    boolean debug -> F0
+    boolean enableStringSwitchConversion -> O
+    boolean skipIR -> F0
     boolean libraryInterfacesMayHaveStaticInitialization -> p
     java.lang.String dumpInputToFile -> k
-    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> p0
-    boolean forceProguardCompatibility -> B0
+    boolean reportMissingClassesInInnerClassAttributes -> B0
+    boolean enableRedundantConstNumberOptimization -> W
     boolean enableClassStaticizer -> x
     com.android.tools.r8.graph.DexItemFactory itemFactory -> a
-    com.android.tools.r8.utils.InternalOptions$OutlineOptions outline -> R
-    java.util.Set reportedMissingForDesugaring -> l1
-    com.android.tools.r8.utils.AndroidApiLevel minApiLevel -> i0
-    boolean enableTreeShaking -> w0
-    com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions -> N0
+    boolean enableMainDexListCheck -> w0
     java.util.function.BiPredicate dexClassChecksumFilter -> G
     boolean encodeChecksums -> F
-    int threadCount -> W
-    boolean enableLoadStoreOptimization -> o0
-    java.util.List methodsFilter -> h0
-    boolean retainCompileTimeAnnotations -> k0
+    boolean intermediate -> k0
     com.android.tools.r8.DataResourceConsumer dataResourceConsumer -> e
     boolean passthroughDexCode -> m
-    boolean hasMarker -> d0
-    int minimumStringSwitchSize -> O
-    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> g1
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer keptGraphConsumer -> g1
     boolean enableEnumUnboxing -> u
-    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> J0
-    com.android.tools.r8.StringConsumer proguardMapConsumer -> Y0
+    com.android.tools.r8.utils.InternalOptions$TestingOptions testing -> P0
+    com.android.tools.r8.StringConsumer mainDexListConsumer -> Y0
+    boolean skipReadingDexCode -> X0
+    java.util.Map warningInvalidDebugInfo -> W0
     com.android.tools.r8.utils.Reporter reporter -> c
-    boolean enableRedundantFieldLoadElimination -> T
-    com.android.tools.r8.StringConsumer configurationConsumer -> b1
-    com.android.tools.r8.utils.OffOrAuto interfaceMethodDesugaring -> r0
-    java.util.List mainDexKeepRules -> P0
-    java.util.Set extensiveInterfaceMethodMinifierLoggingFilter -> g0
+    boolean enableInitializedClassesInInstanceMethodsAnalysis -> T
+    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> H0
+    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> L0
+    com.android.tools.r8.StringConsumer proguardSeedsConsumer -> b1
+    int SUPPORTED_DEX_VERSION -> s1
+    java.util.Set extensiveLoggingFilter -> g0
+    int threadCount -> X
+    com.android.tools.r8.StringConsumer desugaredLibraryKeepRuleConsumer -> f1
     java.util.Set neverMergePrefixes -> o
-    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> L0
-    com.android.tools.r8.DumpOptions dumpOptions -> c0
+    java.util.function.Consumer syntheticProguardRulesConsumer -> j1
     boolean enableNameReflectionOptimization -> C
-    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> o1
-    boolean enableSwitchRewriting -> M
+    int minimumStringSwitchSize -> P
     boolean enableNeverMergePrefixes -> n
-    boolean relocatorCompilation -> d1
-    boolean enableUninstantiatedTypeOptimizationForInterfaces -> U
+    boolean debug -> G0
+    com.android.tools.r8.utils.InternalOptions$DesugarState desugarState -> q0
+    boolean forceProguardCompatibility -> C0
+    boolean enableRedundantFieldLoadElimination -> U
     boolean enableSimpleInliningConstraints -> v
-    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> H0
-    boolean enableMinification -> x0
-    com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking -> K0
-    boolean processCovariantReturnTypeAnnotations -> t0
-    boolean ignoreBootClasspathEnumsForMaindexTracing -> l0
+    boolean enableTreeShaking -> x0
+    boolean enableLoadStoreOptimization -> p0
+    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> i1
+    boolean retainCompileTimeAnnotations -> l0
+    java.util.List methodsFilter -> i0
     boolean enableStringConcatenationOptimization -> D
-    com.android.tools.r8.ir.desugar.desugaredlibrary.legacyspecification.LegacyDesugaredLibrarySpecification desugaredLibrarySpecification -> c1
+    boolean hasMarker -> e0
+    com.android.tools.r8.experimental.graphinfo.GraphConsumer mainDexKeptGraphConsumer -> h1
     boolean readDebugSetFileEvent -> J
-    boolean ignoreMainDexMissingClasses -> a0
-    com.android.tools.r8.StringConsumer usageInformationConsumer -> Z0
+    boolean invalidDebugInfoStrict -> a0
+    com.android.tools.r8.StringConsumer proguardMapConsumer -> Z0
+    com.android.tools.r8.dex.Marker marker -> f0
+    boolean enableEnumSwitchMapRemoval -> R
+    java.util.Set invalidLibraryClasses -> o1
     boolean enableUnusedInterfaceRemoval -> s
-    java.util.Map warningInvalidDebugInfo -> V0
-    com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions -> G0
-    int SUPPORTED_DEX_VERSION -> r1
-    boolean invalidDebugInfoStrict -> Z
-    java.util.Set extensiveLoggingFilter -> f0
-    boolean minimalMainDex -> Q0
-    java.util.function.Consumer syntheticProguardRulesConsumer -> i1
+    com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions -> K0
+    java.util.Map warningInvalidParameterAnnotations -> V0
+    com.android.tools.r8.StringConsumer configurationConsumer -> c1
+    com.android.tools.r8.utils.AssertionConfigurationWithDefault assertionsConfiguration -> D0
+    java.util.List mainDexKeepRules -> Q0
+    com.android.tools.r8.cf.CfVersion EXPERIMENTAL_CF_VERSION -> r1
+    com.android.tools.r8.SourceFileProvider sourceFileProvider -> l1
+    boolean invalidDebugInfoFatal -> Z
+    com.android.tools.r8.MapIdProvider mapIdProvider -> k1
+    com.android.tools.r8.utils.Box reportedExperimentClassFileVersion -> p1
     boolean enableDeterminismAnalysis -> A
-    boolean configurationDebugging -> D0
+    com.android.tools.r8.DumpOptions dumpOptions -> d0
+    com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions -> M0
+    boolean relocatorCompilation -> e1
     com.android.tools.r8.shaking.ProguardConfiguration proguardConfiguration -> b
+    com.android.tools.r8.utils.InternalOptions$LineNumberOptimization lineNumberOptimization -> T0
     boolean disableL8AnnotationRemoval -> K
-    com.android.tools.r8.DesugarGraphConsumer desugarGraphConsumer -> h1
-    boolean ignoreMissingClasses -> y0
-    boolean enableInitializedClassesInInstanceMethodsAnalysis -> S
+    com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions -> I0
+    boolean enableMinification -> y0
     boolean enableDevirtualization -> t
-    boolean lookupLibraryBeforeProgram -> u0
-    java.util.List logArgumentsFilter -> n0
-    java.util.Set invalidLibraryClasses -> n1
-    boolean enableNestReduction -> q0
-    java.util.concurrent.atomic.AtomicBoolean reportedErrorReadingKotlinMetadataReflectively -> m1
-    boolean pruneNonVissibleAnnotationClasses -> m0
+    boolean processCovariantReturnTypeAnnotations -> u0
+    java.lang.Thread mainThread -> M
+    boolean ignoreBootClasspathEnumsForMaindexTracing -> m0
     boolean enableServiceLoaderRewriting -> B
+    com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions -> J0
     1:32:void <clinit>():106:137 -> <clinit>
     1:1:void <init>():168:168 -> <init>
-    2:916:void <init>():159:1073 -> <init>
-    917:921:void <init>():169:173 -> <init>
-    922:922:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):177:177 -> <init>
-    923:1837:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:1073 -> <init>
-    1838:1845:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):178:185 -> <init>
-    1846:1846:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):190:190 -> <init>
-    1847:2761:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):159:1073 -> <init>
-    2762:2782:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):191:211 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> A
-    1:1:boolean canHaveTracingPastInstructionsStreamBug():2156 -> A
-    2:2:boolean canHaveTracingPastInstructionsStreamBug():2156:2156 -> A
-    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():663:663 -> A0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> B
-    1:1:boolean canHaveZipFileWithMissingCloseableBug():2281 -> B
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> B
-    2:2:boolean canHaveZipFileWithMissingCloseableBug():2281 -> B
-    3:3:boolean canHaveZipFileWithMissingCloseableBug():2281:2281 -> B
-    1:3:boolean isMinifying():592:592 -> B0
-    5:5:boolean isMinifying():594:594 -> B0
-    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1930:1930 -> C
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> C
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> C
-    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1930 -> C
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> C
-    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1930 -> C
-    1:1:boolean isOptimizing():578:578 -> C0
-    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1829:1829 -> D
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> D
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> D
-    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1829 -> D
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> D
-    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1829 -> D
-    1:1:boolean isRelease():582:582 -> D0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> E
-    1:1:boolean canParseNumbersWithPlusPrefix():2297 -> E
-    2:2:boolean canParseNumbersWithPlusPrefix():2297:2297 -> E
-    1:1:boolean isRepackagingEnabled():619:619 -> E0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1219:1219 -> E0
-    2:2:boolean isRepackagingEnabled():619 -> E0
+    2:919:void <init>():159:1076 -> <init>
+    920:924:void <init>():169:173 -> <init>
+    925:925:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):177:177 -> <init>
+    926:1843:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):159:1076 -> <init>
+    1844:1851:void <init>(com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.utils.Reporter):178:185 -> <init>
+    1852:1852:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):190:190 -> <init>
+    1853:2770:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):159:1076 -> <init>
+    2771:2791:void <init>(com.android.tools.r8.CompilationMode,com.android.tools.r8.shaking.ProguardConfiguration,com.android.tools.r8.utils.Reporter):191:211 -> <init>
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> A
+    1:1:boolean canHaveTracingPastInstructionsStreamBug():2159 -> A
+    2:2:boolean canHaveTracingPastInstructionsStreamBug():2159:2159 -> A
+    1:1:boolean isKeepRuntimeVisibleParameterAnnotationsEnabled():666:666 -> A0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> B
+    1:1:boolean canHaveZipFileWithMissingCloseableBug():2284 -> B
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> B
+    2:2:boolean canHaveZipFileWithMissingCloseableBug():2284 -> B
+    3:3:boolean canHaveZipFileWithMissingCloseableBug():2284:2284 -> B
+    1:3:boolean isMinifying():595:595 -> B0
+    5:5:boolean isMinifying():597:597 -> B0
+    1:1:boolean canInitCauseAfterAssertionErrorObjectConstructor():1933:1933 -> C
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> C
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> C
+    2:2:boolean canInitCauseAfterAssertionErrorObjectConstructor():1933 -> C
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> C
+    3:3:boolean canInitCauseAfterAssertionErrorObjectConstructor():1933 -> C
+    1:1:boolean isOptimizing():581:581 -> C0
+    1:1:boolean canLeaveStaticInterfaceMethodInvokes():1832:1832 -> D
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> D
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> D
+    2:2:boolean canLeaveStaticInterfaceMethodInvokes():1832 -> D
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> D
+    3:3:boolean canLeaveStaticInterfaceMethodInvokes():1832 -> D
+    1:1:boolean isRelease():585:585 -> D0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> E
+    1:1:boolean canParseNumbersWithPlusPrefix():2300 -> E
+    2:2:boolean canParseNumbersWithPlusPrefix():2300:2300 -> E
+    1:1:boolean isRepackagingEnabled():622:622 -> E0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1222:1222 -> E0
+    2:2:boolean isRepackagingEnabled():622 -> E0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1203:1203 -> E0
-    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1219 -> E0
-    3:3:boolean isRepackagingEnabled():619 -> E0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isNone():1206:1206 -> E0
+    3:3:boolean com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode.isSome():1222 -> E0
+    3:3:boolean isRepackagingEnabled():622 -> E0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(2)"]}
-    4:4:boolean isRepackagingEnabled():619:619 -> E0
-    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1911:1911 -> F
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> F
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> F
-    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1911 -> F
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> F
-    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1911 -> F
-    1:3:boolean isShrinking():586:586 -> F0
-    5:5:boolean isShrinking():588:588 -> F0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> G
-    1:1:boolean canUseConstantMethodHandle():1805 -> G
-    2:2:boolean canUseConstantMethodHandle():1805:1805 -> G
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> G
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> G
-    3:3:boolean canUseConstantMethodHandle():1805 -> G
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> G
-    4:4:boolean canUseConstantMethodHandle():1805 -> G
-    1:1:boolean isStringSwitchConversionEnabled():1886:1886 -> G0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> H
-    1:1:boolean canUseConstantMethodType():1809 -> H
-    2:2:boolean canUseConstantMethodType():1809:1809 -> H
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> H
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> H
-    3:3:boolean canUseConstantMethodType():1809 -> H
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> H
-    4:4:boolean canUseConstantMethodType():1809 -> H
+    4:4:boolean isRepackagingEnabled():622:622 -> E0
+    1:1:boolean canUseAssertionErrorTwoArgumentConstructor():1914:1914 -> F
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> F
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> F
+    2:2:boolean canUseAssertionErrorTwoArgumentConstructor():1914 -> F
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> F
+    3:3:boolean canUseAssertionErrorTwoArgumentConstructor():1914 -> F
+    1:3:boolean isShrinking():589:589 -> F0
+    5:5:boolean isShrinking():591:591 -> F0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> G
+    1:1:boolean canUseConstantMethodHandle():1808 -> G
+    2:2:boolean canUseConstantMethodHandle():1808:1808 -> G
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> G
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> G
+    3:3:boolean canUseConstantMethodHandle():1808 -> G
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> G
+    4:4:boolean canUseConstantMethodHandle():1808 -> G
+    1:1:boolean isStringSwitchConversionEnabled():1889:1889 -> G0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> H
+    1:1:boolean canUseConstantMethodType():1812 -> H
+    2:2:boolean canUseConstantMethodType():1812:1812 -> H
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> H
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> H
+    3:3:boolean canUseConstantMethodType():1812 -> H
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> H
+    4:4:boolean canUseConstantMethodType():1812 -> H
     1:6:void keepDebugRelatedInformation():216:221 -> H0
-    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1817:1817 -> I
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> I
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> I
-    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1817 -> I
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> I
-    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1817 -> I
-    1:2:boolean keepInnerClassStructure():691:692 -> I0
-    1:1:boolean canUseDexPcAsDebugInformation():1866:1866 -> J
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> J
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> J
-    2:2:boolean canUseDexPcAsDebugInformation():1867 -> J
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> J
-    3:3:boolean canUseDexPcAsDebugInformation():1867 -> J
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1862:1862 -> J
-    4:4:boolean canUseDexPcAsDebugInformation():1868 -> J
-    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():763:763 -> J0
-    1:2:boolean canUseFilledNewArrayOfObjects():1942:1943 -> K
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> K
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> K
-    3:3:boolean canUseFilledNewArrayOfObjects():1943 -> K
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> K
-    4:4:boolean canUseFilledNewArrayOfObjects():1943 -> K
-    1:1:boolean parseSignatureAttribute():628:628 -> K0
-    1:1:boolean canUseInputStackMaps():696:696 -> L
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> L
-    2:2:boolean canUseInputStackMaps():696 -> L
-    1:32:boolean printWarnings():1093:1124 -> L0
-    33:72:boolean printWarnings():1120:1159 -> L0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> M
-    1:1:boolean canUseInvokeCustom():1813 -> M
-    2:2:boolean canUseInvokeCustom():1813:1813 -> M
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> M
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> M
-    3:3:boolean canUseInvokeCustom():1813 -> M
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> M
-    4:4:boolean canUseInvokeCustom():1813 -> M
-    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():759:759 -> M0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> N
-    1:1:boolean canUseInvokePolymorphic():1801 -> N
-    2:2:boolean canUseInvokePolymorphic():1801:1801 -> N
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> N
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> N
-    3:3:boolean canUseInvokePolymorphic():1801 -> N
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> N
-    4:4:boolean canUseInvokePolymorphic():1801 -> N
-    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1792:1792 -> N0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> N0
-    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1792 -> N0
-    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1792:1793 -> N0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> O
-    1:1:boolean canUseInvokePolymorphicOnVarHandle():1797 -> O
-    2:2:boolean canUseInvokePolymorphicOnVarHandle():1797:1797 -> O
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> O
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> O
-    3:3:boolean canUseInvokePolymorphicOnVarHandle():1797 -> O
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> O
-    4:4:boolean canUseInvokePolymorphicOnVarHandle():1797 -> O
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():418:418 -> O0
-    1:1:boolean shouldBackportMethods():446 -> O0
-    2:2:boolean shouldBackportMethods():446:446 -> O0
-    1:1:boolean canUseJavaUtilObjects():1895:1895 -> P
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> P
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> P
-    2:2:boolean canUseJavaUtilObjects():1895 -> P
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> P
-    3:3:boolean canUseJavaUtilObjects():1895 -> P
-    1:1:boolean shouldDesugarRecords():519:519 -> P0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1825:1825 -> P0
-    2:2:boolean shouldDesugarRecords():519 -> P0
-    1:1:boolean canUseJavaUtilObjectsIsNull():1899:1899 -> Q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> Q
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> Q
-    2:2:boolean canUseJavaUtilObjectsIsNull():1899 -> Q
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> Q
-    3:3:boolean canUseJavaUtilObjectsIsNull():1899 -> Q
-    1:1:boolean shouldKeepStackMapTable():450:450 -> Q0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():442:442 -> Q0
-    2:2:boolean shouldKeepStackMapTable():450 -> Q0
-    3:4:boolean shouldKeepStackMapTable():450:451 -> Q0
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():442:442 -> Q0
-    5:5:boolean shouldKeepStackMapTable():452 -> Q0
-    6:6:boolean shouldKeepStackMapTable():453:453 -> Q0
-    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1903:1903 -> R
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> R
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> R
-    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1903 -> R
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> R
-    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1903 -> R
-    1:1:boolean shouldRerunEnqueuer():457:457 -> R0
-    1:2:boolean canUseMultidex():1890:1891 -> S
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> S
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> S
-    3:3:boolean canUseMultidex():1891 -> S
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> S
-    4:4:boolean canUseMultidex():1891 -> S
-    1:18:void signalFinishedToConsumers():493:510 -> S0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> T
-    1:1:boolean canUseNotInstruction():1978 -> T
-    2:2:boolean canUseNotInstruction():1978:1978 -> T
-    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> T
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> T
-    3:3:boolean canUseNotInstruction():1978 -> T
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> T
-    4:4:boolean canUseNotInstruction():1978 -> T
-    1:2:void warningReadingKotlinMetadataReflective():1018:1019 -> T0
-    1:1:boolean canUsePrivateInterfaceMethods():1855:1855 -> U
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> U
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> U
-    2:2:boolean canUsePrivateInterfaceMethods():1855 -> U
-    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> U
-    3:3:boolean canUsePrivateInterfaceMethods():1855 -> U
-    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1951:1951 -> V
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> V
-    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1952 -> V
-    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1952:1952 -> V
-    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():747:747 -> W
-    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():771:771 -> X
+    1:1:boolean canUseDefaultAndStaticInterfaceMethods():1820:1820 -> I
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> I
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> I
+    2:2:boolean canUseDefaultAndStaticInterfaceMethods():1820 -> I
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> I
+    3:3:boolean canUseDefaultAndStaticInterfaceMethods():1820 -> I
+    1:2:boolean keepInnerClassStructure():694:695 -> I0
+    1:1:boolean canUseDexPcAsDebugInformation():1869:1869 -> J
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> J
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> J
+    2:2:boolean canUseDexPcAsDebugInformation():1870 -> J
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> J
+    3:3:boolean canUseDexPcAsDebugInformation():1870 -> J
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1865:1865 -> J
+    4:4:boolean canUseDexPcAsDebugInformation():1871 -> J
+    1:1:com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions kotlinOptimizationOptions():766:766 -> J0
+    1:2:boolean canUseFilledNewArrayOfObjects():1945:1946 -> K
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> K
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> K
+    3:3:boolean canUseFilledNewArrayOfObjects():1946 -> K
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> K
+    4:4:boolean canUseFilledNewArrayOfObjects():1946 -> K
+    1:1:boolean parseSignatureAttribute():631:631 -> K0
+    1:1:boolean canUseInputStackMaps():699:699 -> L
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> L
+    2:2:boolean canUseInputStackMaps():699 -> L
+    1:32:boolean printWarnings():1096:1127 -> L0
+    33:72:boolean printWarnings():1123:1162 -> L0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> M
+    1:1:boolean canUseInvokeCustom():1816 -> M
+    2:2:boolean canUseInvokeCustom():1816:1816 -> M
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> M
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> M
+    3:3:boolean canUseInvokeCustom():1816 -> M
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> M
+    4:4:boolean canUseInvokeCustom():1816 -> M
+    1:1:com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions protoShrinking():762:762 -> M0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> N
+    1:1:boolean canUseInvokePolymorphic():1804 -> N
+    2:2:boolean canUseInvokePolymorphic():1804:1804 -> N
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> N
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> N
+    3:3:boolean canUseInvokePolymorphic():1804 -> N
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> N
+    4:4:boolean canUseInvokePolymorphic():1804 -> N
+    1:1:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1795:1795 -> N0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> N0
+    2:2:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1795 -> N0
+    3:4:com.android.tools.r8.cf.CfVersion requiredCfVersionForConstClassInstructions():1795:1796 -> N0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> O
+    1:1:boolean canUseInvokePolymorphicOnVarHandle():1800 -> O
+    2:2:boolean canUseInvokePolymorphicOnVarHandle():1800:1800 -> O
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> O
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> O
+    3:3:boolean canUseInvokePolymorphicOnVarHandle():1800 -> O
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> O
+    4:4:boolean canUseInvokePolymorphicOnVarHandle():1800 -> O
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> O0
+    1:1:boolean shouldBackportMethods():449 -> O0
+    2:2:boolean shouldBackportMethods():449:449 -> O0
+    1:1:boolean canUseJavaUtilObjects():1898:1898 -> P
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> P
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> P
+    2:2:boolean canUseJavaUtilObjects():1898 -> P
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> P
+    3:3:boolean canUseJavaUtilObjects():1898 -> P
+    1:1:boolean shouldDesugarRecords():522:522 -> P0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.canUseRecords():1828:1828 -> P0
+    2:2:boolean shouldDesugarRecords():522 -> P0
+    1:1:boolean canUseJavaUtilObjectsIsNull():1902:1902 -> Q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> Q
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> Q
+    2:2:boolean canUseJavaUtilObjectsIsNull():1902 -> Q
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> Q
+    3:3:boolean canUseJavaUtilObjectsIsNull():1902 -> Q
+    1:1:boolean shouldKeepStackMapTable():453:453 -> Q0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():445:445 -> Q0
+    2:2:boolean shouldKeepStackMapTable():453 -> Q0
+    3:4:boolean shouldKeepStackMapTable():453:454 -> Q0
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isRelocatorCompilation():445:445 -> Q0
+    5:5:boolean shouldKeepStackMapTable():455 -> Q0
+    6:6:boolean shouldKeepStackMapTable():456:456 -> Q0
+    1:1:boolean canUseJavaUtilObjectsRequireNonNull():1906:1906 -> R
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> R
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> R
+    2:2:boolean canUseJavaUtilObjectsRequireNonNull():1906 -> R
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> R
+    3:3:boolean canUseJavaUtilObjectsRequireNonNull():1906 -> R
+    1:1:boolean shouldRerunEnqueuer():460:460 -> R0
+    1:2:boolean canUseMultidex():1893:1894 -> S
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> S
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> S
+    3:3:boolean canUseMultidex():1894 -> S
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> S
+    4:4:boolean canUseMultidex():1894 -> S
+    1:18:void signalFinishedToConsumers():496:513 -> S0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> T
+    1:1:boolean canUseNotInstruction():1981 -> T
+    2:2:boolean canUseNotInstruction():1981:1981 -> T
+    3:3:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> T
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> T
+    3:3:boolean canUseNotInstruction():1981 -> T
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> T
+    4:4:boolean canUseNotInstruction():1981 -> T
+    1:2:void warningReadingKotlinMetadataReflective():1021:1022 -> T0
+    1:1:boolean canUsePrivateInterfaceMethods():1858:1858 -> U
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> U
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> U
+    2:2:boolean canUsePrivateInterfaceMethods():1858 -> U
+    3:3:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> U
+    3:3:boolean canUsePrivateInterfaceMethods():1858 -> U
+    1:1:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1954:1954 -> V
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> V
+    2:2:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1955 -> V
+    3:3:boolean canUseSameArrayAndResultRegisterInArrayGetWide():1955:1955 -> V
+    1:1:com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions classInlinerOptions():750:750 -> W
+    1:1:com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions desugarSpecificOptions():774:774 -> X
     1:1:com.android.tools.r8.graph.DexItemFactory dexItemFactory():144:144 -> Y
     1:3:void disableAllOptimizations():234:236 -> Z
     boolean lambda$new$0(java.lang.String,java.lang.Long) -> a
     1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions access$200(com.android.tools.r8.utils.InternalOptions):106:106 -> a
-    2:3:void setMarker(com.android.tools.r8.dex.Marker):362:363 -> a
-    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):367:368 -> a
-    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):375:381 -> a
-    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
-    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):382 -> a
-    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
-    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):382:387 -> a
-    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
-    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> a
-    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):388 -> a
-    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
-    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):388:397 -> a
-    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370 -> a
-    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):404:413 -> a
-    41:42:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):573:574 -> a
-    43:52:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):671:680 -> a
-    53:54:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):804:805 -> a
+    2:3:void setMarker(com.android.tools.r8.dex.Marker):365:366 -> a
+    4:5:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):370:371 -> a
+    6:12:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):378:384 -> a
+    6:12:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
+    13:13:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    13:13:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385 -> a
+    13:13:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
+    14:19:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):385:390 -> a
+    14:19:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
+    20:20:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> a
+    20:20:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391 -> a
+    20:20:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
+    21:30:com.android.tools.r8.dex.Marker com.android.tools.r8.utils.InternalOptions.createMarker(com.android.tools.r8.dex.Marker$Tool):391:400 -> a
+    21:30:com.android.tools.r8.dex.Marker getMarker(com.android.tools.r8.dex.Marker$Tool):373 -> a
+    31:40:void setDumpInputFlags(com.android.tools.r8.utils.DumpInputFlags,boolean):407:416 -> a
+    41:42:void setMinApiLevel(com.android.tools.r8.utils.AndroidApiLevel):576:577 -> a
+    43:52:boolean isClassMergingExtensionRequired(com.android.tools.r8.shaking.Enqueuer$Mode):674:683 -> a
+    53:54:boolean com.android.tools.r8.utils.InternalOptions.isSystemPropertyForDevelopmentSet(java.lang.String):807:808 -> a
     53:54:boolean access$000(java.lang.String):106 -> a
-    55:57:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):947:949 -> a
+    55:57:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):950:952 -> a
     58:58:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    58:58:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):949 -> a
+    58:58:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):952 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    59:59:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):949:949 -> a
-    60:60:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):947:947 -> a
-    61:67:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):991:997 -> a
-    68:68:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):992:992 -> a
-    69:70:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1004:1005 -> a
+    59:59:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):952:952 -> a
+    60:60:java.lang.RuntimeException errorMissingNestMember(com.android.tools.r8.ir.desugar.nest.Nest):950:950 -> a
+    61:67:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):994:1000 -> a
+    68:68:void warningMissingTypeForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.position.Position,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexMethod):995:995 -> a
+    69:70:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1007:1008 -> a
     71:71:com.android.tools.r8.origin.Origin com.android.tools.r8.graph.DexClass.getOrigin():761:761 -> a
-    71:71:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1007 -> a
+    71:71:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1010 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    72:78:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1007:1013 -> a
-    79:79:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1005:1005 -> a
-    80:88:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1033:1041 -> a
-    89:89:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1040:1040 -> a
-    90:90:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1034:1034 -> a
-    91:91:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1042:1042 -> a
-    92:95:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1047:1050 -> a
-    96:100:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1055:1059 -> a
-    101:107:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1064:1070 -> a
-    108:108:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1065:1065 -> a
-    109:109:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1069:1069 -> a
-    110:115:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1173:1178 -> a
-    116:116:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1787:1787 -> a
-    117:117:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    117:117:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1787 -> a
-    118:119:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1787:1788 -> a
+    72:78:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1010:1016 -> a
+    79:79:void warningMissingInterfaceForDesugar(com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexClass,com.android.tools.r8.graph.DexType):1008:1008 -> a
+    80:88:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1036:1044 -> a
+    89:89:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1043:1043 -> a
+    90:90:void warningInvalidLibrarySuperclassForDesugar(com.android.tools.r8.origin.Origin,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,java.lang.String,com.android.tools.r8.utils.collections.DexClassAndMethodSet):1037:1037 -> a
+    91:91:com.android.tools.r8.references.MethodReference lambda$warningInvalidLibrarySuperclassForDesugar$1(com.android.tools.r8.graph.DexClassAndMethod):1045:1045 -> a
+    92:95:void warningMissingEnclosingMember(com.android.tools.r8.graph.DexType,com.android.tools.r8.origin.Origin,com.android.tools.r8.cf.CfVersion):1050:1053 -> a
+    96:100:void warningInvalidParameterAnnotations(com.android.tools.r8.graph.DexMethod,com.android.tools.r8.origin.Origin,int,int):1058:1062 -> a
+    101:107:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1067:1073 -> a
+    108:108:void warningInvalidDebugInfo(com.android.tools.r8.graph.ProgramMethod,com.android.tools.r8.origin.Origin,com.android.tools.r8.errors.InvalidDebugInfoException):1068:1068 -> a
+    109:109:java.util.List lambda$warningInvalidDebugInfo$4(com.android.tools.r8.origin.Origin):1072:1072 -> a
+    110:115:boolean methodMatchesFilter(com.android.tools.r8.graph.DexEncodedMethod):1176:1181 -> a
+    116:116:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1790:1790 -> a
+    117:117:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    117:117:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1790 -> a
+    118:119:boolean canUseConstClassInstructions(com.android.tools.r8.cf.CfVersion):1790:1791 -> a
     1:14:void disableGlobalOptimizations():240:253 -> a0
-    15:15:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1526:1526 -> a0
+    15:15:void com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions.disableApiCallerIdentification():1529:1529 -> a0
     15:15:void disableGlobalOptimizations():253 -> a0
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     1:1:com.android.tools.r8.utils.Box access$300(com.android.tools.r8.utils.InternalOptions):106:106 -> b
-    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):812:815 -> b
+    2:5:int com.android.tools.r8.utils.InternalOptions.parseSystemPropertyForDevelopmentOrDefault(java.lang.String,int):815:818 -> b
     2:5:int access$100(java.lang.String,int):106 -> b
-    6:39:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):953:986 -> b
-    40:40:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1058:1058 -> b
-    1:1:void disableNameReflectionOptimization():1754:1754 -> b0
-    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():767:767 -> c
-    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1049:1049 -> c
-    1:1:boolean enableBackportedMethodRewriting():1841:1841 -> c0
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> c0
-    2:2:boolean enableBackportedMethodRewriting():1841 -> c0
-    3:3:boolean enableBackportedMethodRewriting():1841:1841 -> c0
-    1:1:boolean assertionsEnabled():914:914 -> d
-    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1076:1085 -> d
-    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1081:1087 -> d
+    6:39:java.lang.String messageErrorIncompleteNest(com.android.tools.r8.ir.desugar.nest.Nest):956:989 -> b
+    40:40:java.util.List lambda$warningInvalidParameterAnnotations$3(com.android.tools.r8.origin.Origin):1061:1061 -> b
+    1:1:void disableNameReflectionOptimization():1757:1757 -> b0
+    1:1:com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions apiModelingOptions():770:770 -> c
+    2:2:java.util.List lambda$warningMissingEnclosingMember$2(com.android.tools.r8.origin.Origin):1052:1052 -> c
+    1:1:boolean enableBackportedMethodRewriting():1844:1844 -> c0
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> c0
+    2:2:boolean enableBackportedMethodRewriting():1844 -> c0
+    3:3:boolean enableBackportedMethodRewriting():1844:1844 -> c0
+    1:1:boolean assertionsEnabled():917:917 -> d
+    2:11:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1079:1088 -> d
+    12:18:void warningExperimentalClassFileVersion(com.android.tools.r8.origin.Origin):1084:1090 -> d
     1:6:void enableProtoShrinking():225:230 -> d0
-    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():743:743 -> e
-    1:5:boolean enableTryWithResourcesDesugaring():1845:1849 -> e0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1833:1833 -> e0
-    6:6:boolean enableTryWithResourcesDesugaring():1849 -> e0
-    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> e0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758 -> e0
-    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1833 -> e0
-    7:7:boolean enableTryWithResourcesDesugaring():1849 -> e0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1758:1758 -> e0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1833 -> e0
-    8:8:boolean enableTryWithResourcesDesugaring():1849 -> e0
-    9:9:boolean enableTryWithResourcesDesugaring():1851:1851 -> e0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> f
-    1:1:boolean canHaveArtCheckCastVerifierBug():2228 -> f
-    2:2:boolean canHaveArtCheckCastVerifierBug():2228:2228 -> f
-    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():792:800 -> f0
-    1:1:boolean canHaveArtInstanceOfVerifierBug():2183:2183 -> g
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> g
-    2:2:boolean canHaveArtInstanceOfVerifierBug():2184 -> g
-    3:3:boolean canHaveArtInstanceOfVerifierBug():2184:2184 -> g
-    1:9:java.util.Set getExtensiveLoggingFilter():779:787 -> g0
-    1:1:boolean canHaveArtStringNewInitBug():2108:2108 -> h
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> h
-    2:2:boolean canHaveArtStringNewInitBug():2108 -> h
-    3:3:boolean canHaveArtStringNewInitBug():2108:2108 -> h
-    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():422:422 -> h0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():418:418 -> h0
-    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():422 -> h0
-    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():422:422 -> h0
-    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():465:465 -> h0
-    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():423 -> h0
-    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():424:424 -> h0
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> h0
-    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425 -> h0
-    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426:426 -> h0
-    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> h0
-    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427 -> h0
-    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428:430 -> h0
-    1:1:boolean canHaveBoundsCheckEliminationBug():1969:1969 -> i
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> i
-    2:2:boolean canHaveBoundsCheckEliminationBug():1969 -> i
-    3:3:boolean canHaveBoundsCheckEliminationBug():1969:1969 -> i
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():569:569 -> i0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> j
-    1:1:boolean canHaveCmpIfFloatBug():2061 -> j
-    2:2:boolean canHaveCmpIfFloatBug():2061:2061 -> j
+    1:1:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions callSiteOptimizationOptions():746:746 -> e
+    1:5:boolean enableTryWithResourcesDesugaring():1848:1852 -> e0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1836:1836 -> e0
+    6:6:boolean enableTryWithResourcesDesugaring():1852 -> e0
+    7:7:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> e0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761 -> e0
+    7:7:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1836 -> e0
+    7:7:boolean enableTryWithResourcesDesugaring():1852 -> e0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.hasMinApi(com.android.tools.r8.utils.AndroidApiLevel):1761:1761 -> e0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.canUseTwrCloseResourceMethod():1836 -> e0
+    8:8:boolean enableTryWithResourcesDesugaring():1852 -> e0
+    9:9:boolean enableTryWithResourcesDesugaring():1854:1854 -> e0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> f
+    1:1:boolean canHaveArtCheckCastVerifierBug():2231 -> f
+    2:2:boolean canHaveArtCheckCastVerifierBug():2231:2231 -> f
+    1:9:java.util.Set getExtensiveInterfaceMethodMinifierLoggingFilter():795:803 -> f0
+    1:1:boolean canHaveArtInstanceOfVerifierBug():2186:2186 -> g
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> g
+    2:2:boolean canHaveArtInstanceOfVerifierBug():2187 -> g
+    3:3:boolean canHaveArtInstanceOfVerifierBug():2187:2187 -> g
+    1:9:java.util.Set getExtensiveLoggingFilter():782:790 -> g0
+    1:1:boolean canHaveArtStringNewInitBug():2111:2111 -> h
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> h
+    2:2:boolean canHaveArtStringNewInitBug():2111 -> h
+    3:3:boolean canHaveArtStringNewInitBug():2111:2111 -> h
+    1:1:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425:425 -> h0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> h0
+    2:2:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425 -> h0
+    3:3:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():425:425 -> h0
+    4:4:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():468:468 -> h0
+    4:4:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():426 -> h0
+    5:5:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():427:427 -> h0
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> h0
+    6:6:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():428 -> h0
+    7:7:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():429:429 -> h0
+    8:8:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> h0
+    8:8:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():430 -> h0
+    9:11:com.android.tools.r8.utils.InternalOutputMode getInternalOutputMode():431:433 -> h0
+    1:1:boolean canHaveBoundsCheckEliminationBug():1972:1972 -> i
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> i
+    2:2:boolean canHaveBoundsCheckEliminationBug():1972 -> i
+    3:3:boolean canHaveBoundsCheckEliminationBug():1972:1972 -> i
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getMinApiLevel():572:572 -> i0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> j
+    1:1:boolean canHaveCmpIfFloatBug():2064 -> j
+    2:2:boolean canHaveCmpIfFloatBug():2064:2064 -> j
     1:1:com.android.tools.r8.shaking.ProguardConfiguration getProguardConfiguration():152:152 -> j0
-    1:1:boolean canHaveCmpLongBug():2033:2033 -> k
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> k
-    2:2:boolean canHaveCmpLongBug():2033 -> k
-    3:3:boolean canHaveCmpLongBug():2033:2033 -> k
-    1:1:boolean hasMethodsFilter():1168:1168 -> k0
-    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2260:2260 -> l
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> l
-    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2260 -> l
-    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2260:2260 -> l
+    1:1:boolean canHaveCmpLongBug():2036:2036 -> k
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> k
+    2:2:boolean canHaveCmpLongBug():2036 -> k
+    3:3:boolean canHaveCmpLongBug():2036:2036 -> k
+    1:1:boolean hasMethodsFilter():1171:1171 -> k0
+    1:1:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2263:2263 -> l
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> l
+    2:2:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2263 -> l
+    3:3:boolean canHaveDalvikAbstractMethodOnNonAbstractClassVerificationBug():2263:2263 -> l
     1:1:boolean hasProguardConfiguration():148:148 -> l0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> m
-    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2252 -> m
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> m
-    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2252 -> m
-    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2252:2252 -> m
-    1:1:boolean hasUsageInformationConsumer():871:871 -> m0
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> n
-    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2274 -> n
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> n
-    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2274 -> n
-    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2274:2274 -> n
-    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():755:755 -> n0
-    1:1:boolean canHaveDex2OatInliningIssue():2100:2100 -> o
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> o
-    2:2:boolean canHaveDex2OatInliningIssue():2100 -> o
-    3:3:boolean canHaveDex2OatInliningIssue():2100:2100 -> o
-    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():751:751 -> o0
-    1:1:boolean canHaveDex2OatLinkedListBug():2092:2092 -> p
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> p
-    2:2:boolean canHaveDex2OatLinkedListBug():2092 -> p
-    3:3:boolean canHaveDex2OatLinkedListBug():2092:2092 -> p
-    1:1:boolean isDesugaredLibraryCompilation():438:438 -> p0
-    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2141:2141 -> q
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> q
-    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2141 -> q
-    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2141:2141 -> q
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> q0
-    1:1:boolean isDesugaring():477 -> q0
-    2:2:boolean isDesugaring():477:477 -> q0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> r
-    1:1:boolean canHaveExceptionTypeBug():2220 -> r
-    2:2:boolean canHaveExceptionTypeBug():2220:2220 -> r
-    1:1:boolean isGeneratingClassFiles():473:473 -> r0
-    1:1:boolean canHaveForwardingInitInliningBug():2129:2129 -> s
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> s
-    2:2:boolean canHaveForwardingInitInliningBug():2129 -> s
-    3:3:boolean canHaveForwardingInitInliningBug():2129:2129 -> s
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():465:465 -> s0
-    1:1:boolean isGeneratingDex():461 -> s0
-    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():469:469 -> s0
-    2:2:boolean isGeneratingDex():461 -> s0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> t
-    1:1:boolean canHaveLongToIntBug():2207 -> t
-    2:2:boolean canHaveLongToIntBug():2207:2207 -> t
-    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():418:418 -> t0
-    1:1:boolean isInterfaceMethodDesugaringEnabled():1873 -> t0
-    2:4:boolean isInterfaceMethodDesugaringEnabled():1876:1878 -> t0
-    1:1:boolean canHaveMul2AddrBug():2083:2083 -> u
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> u
-    2:2:boolean canHaveMul2AddrBug():2083 -> u
-    3:3:boolean canHaveMul2AddrBug():2083:2083 -> u
-    1:1:boolean isKeepAttributesSignatureEnabled():633:633 -> u0
-    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2116:2116 -> v
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> v
-    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2116 -> v
-    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2116:2116 -> v
-    1:1:boolean isKeepEnclosingMethodAttributeEnabled():638:638 -> v0
-    1:1:boolean canHaveOverlappingLongRegisterBug():2000:2000 -> w
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> w
-    2:2:boolean canHaveOverlappingLongRegisterBug():2000 -> w
-    3:3:boolean canHaveOverlappingLongRegisterBug():2000:2000 -> w
-    1:1:boolean isKeepInnerClassesAttributeEnabled():643:643 -> w0
-    1:1:boolean canHaveSwitchMaxIntBug():2289:2289 -> x
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> x
-    2:2:boolean canHaveSwitchMaxIntBug():2289 -> x
-    3:3:boolean canHaveSwitchMaxIntBug():2289:2289 -> x
-    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():648:648 -> x0
-    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> y
-    1:1:boolean canHaveThisJitCodeDebuggingBug():1994 -> y
-    2:2:boolean canHaveThisJitCodeDebuggingBug():1994:1994 -> y
-    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():653:653 -> y0
-    1:1:boolean canHaveThisTypeVerifierBug():1985:1985 -> z
-    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():569:569 -> z
-    2:2:boolean canHaveThisTypeVerifierBug():1985 -> z
-    3:3:boolean canHaveThisTypeVerifierBug():1985:1985 -> z
-    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():658:658 -> z0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> m
+    1:1:boolean canHaveDalvikCatchHandlerVerificationBug():2255 -> m
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> m
+    2:2:boolean canHaveDalvikCatchHandlerVerificationBug():2255 -> m
+    3:3:boolean canHaveDalvikCatchHandlerVerificationBug():2255:2255 -> m
+    1:1:boolean hasUsageInformationConsumer():874:874 -> m0
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> n
+    1:1:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2277 -> n
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> n
+    2:2:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2277 -> n
+    3:3:boolean canHaveDalvikIntUsedAsNonIntPrimitiveTypeBug():2277:2277 -> n
+    1:1:com.android.tools.r8.utils.InternalOptions$HorizontalClassMergerOptions horizontalClassMergerOptions():758:758 -> n0
+    1:1:boolean canHaveDex2OatInliningIssue():2103:2103 -> o
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> o
+    2:2:boolean canHaveDex2OatInliningIssue():2103 -> o
+    3:3:boolean canHaveDex2OatInliningIssue():2103:2103 -> o
+    1:1:com.android.tools.r8.utils.InternalOptions$InlinerOptions inlinerOptions():754:754 -> o0
+    1:1:boolean canHaveDex2OatLinkedListBug():2095:2095 -> p
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> p
+    2:2:boolean canHaveDex2OatLinkedListBug():2095 -> p
+    3:3:boolean canHaveDex2OatLinkedListBug():2095:2095 -> p
+    1:1:boolean isDesugaredLibraryCompilation():441:441 -> p0
+    1:1:boolean canHaveExceptionTargetingLoopHeaderBug():2144:2144 -> q
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> q
+    2:2:boolean canHaveExceptionTargetingLoopHeaderBug():2144 -> q
+    3:3:boolean canHaveExceptionTargetingLoopHeaderBug():2144:2144 -> q
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> q0
+    1:1:boolean isDesugaring():480 -> q0
+    2:2:boolean isDesugaring():480:480 -> q0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> r
+    1:1:boolean canHaveExceptionTypeBug():2223 -> r
+    2:2:boolean canHaveExceptionTypeBug():2223:2223 -> r
+    1:1:boolean isGeneratingClassFiles():476:476 -> r0
+    1:1:boolean canHaveForwardingInitInliningBug():2132:2132 -> s
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> s
+    2:2:boolean canHaveForwardingInitInliningBug():2132 -> s
+    3:3:boolean canHaveForwardingInitInliningBug():2132:2132 -> s
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexIndexed():468:468 -> s0
+    1:1:boolean isGeneratingDex():464 -> s0
+    2:2:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingDexFilePerClassFile():472:472 -> s0
+    2:2:boolean isGeneratingDex():464 -> s0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> t
+    1:1:boolean canHaveLongToIntBug():2210 -> t
+    2:2:boolean canHaveLongToIntBug():2210:2210 -> t
+    1:1:boolean com.android.tools.r8.utils.InternalOptions.hasConsumer():421:421 -> t0
+    1:1:boolean isInterfaceMethodDesugaringEnabled():1876 -> t0
+    2:4:boolean isInterfaceMethodDesugaringEnabled():1879:1881 -> t0
+    1:1:boolean canHaveMul2AddrBug():2086:2086 -> u
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> u
+    2:2:boolean canHaveMul2AddrBug():2086 -> u
+    3:3:boolean canHaveMul2AddrBug():2086:2086 -> u
+    1:1:boolean isKeepAttributesSignatureEnabled():636:636 -> u0
+    1:1:boolean canHaveNumberConversionRegisterAllocationBug():2119:2119 -> v
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> v
+    2:2:boolean canHaveNumberConversionRegisterAllocationBug():2119 -> v
+    3:3:boolean canHaveNumberConversionRegisterAllocationBug():2119:2119 -> v
+    1:1:boolean isKeepEnclosingMethodAttributeEnabled():641:641 -> v0
+    1:1:boolean canHaveOverlappingLongRegisterBug():2003:2003 -> w
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> w
+    2:2:boolean canHaveOverlappingLongRegisterBug():2003 -> w
+    3:3:boolean canHaveOverlappingLongRegisterBug():2003:2003 -> w
+    1:1:boolean isKeepInnerClassesAttributeEnabled():646:646 -> w0
+    1:1:boolean canHaveSwitchMaxIntBug():2292:2292 -> x
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> x
+    2:2:boolean canHaveSwitchMaxIntBug():2292 -> x
+    3:3:boolean canHaveSwitchMaxIntBug():2292:2292 -> x
+    1:1:boolean isKeepRuntimeInvisibleAnnotationsEnabled():651:651 -> x0
+    1:1:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> y
+    1:1:boolean canHaveThisJitCodeDebuggingBug():1997 -> y
+    2:2:boolean canHaveThisJitCodeDebuggingBug():1997:1997 -> y
+    1:1:boolean isKeepRuntimeInvisibleParameterAnnotationsEnabled():656:656 -> y0
+    1:1:boolean canHaveThisTypeVerifierBug():1988:1988 -> z
+    2:2:com.android.tools.r8.utils.AndroidApiLevel com.android.tools.r8.utils.InternalOptions.getMinApiLevel():572:572 -> z
+    2:2:boolean canHaveThisTypeVerifierBug():1988 -> z
+    3:3:boolean canHaveThisTypeVerifierBug():1988:1988 -> z
+    1:1:boolean isKeepRuntimeVisibleAnnotationsEnabled():661:661 -> z0
 com.android.tools.r8.utils.InternalOptions$1 -> com.android.tools.r8.internal.eu:
     int[] $SwitchMap$com$android$tools$r8$utils$OffOrAuto -> a
-    1:1:void <clinit>():1845:1845 -> <clinit>
+    1:1:void <clinit>():1848:1848 -> <clinit>
 com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions -> com.android.tools.r8.internal.gu$a:
     java.util.Map methodApiMapping -> a
     java.util.Map fieldApiMapping -> b
@@ -117830,50 +117843,50 @@
     boolean checkAllApiReferencesAreSet -> f
     boolean enableStubbingOfClasses -> g
     boolean enableOutliningOfMethods -> h
-    1:12:void <init>():1461:1472 -> <init>
-    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1476:1486 -> a
-    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1482:1482 -> a
-    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1485:1485 -> a
-    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1488:1488 -> a
+    1:12:void <init>():1464:1475 -> <init>
+    1:11:void visitMockedApiLevelsForReferences(com.android.tools.r8.graph.DexItemFactory,java.util.function.Consumer):1479:1489 -> a
+    12:12:void lambda$visitMockedApiLevelsForReferences$0(java.util.Set,com.android.tools.r8.references.MethodReference):1485:1485 -> a
+    13:13:void lambda$visitMockedApiLevelsForReferences$1(java.util.Set,com.android.tools.r8.references.FieldReference):1488:1488 -> a
+    14:14:void lambda$visitMockedApiLevelsForReferences$2(java.util.function.Consumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1491:1491 -> a
 com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions$1 -> com.android.tools.r8.internal.fu:
     com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions this$0 -> c
     com.android.tools.r8.references.ClassReference val$classReference -> b
     com.android.tools.r8.graph.DexItemFactory val$factory -> a
-    1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1489:1489 -> <init>
-    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1497:1497 -> a
-    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1503:1503 -> a
-    3:4:void lambda$visitMethodsWithApiLevels$0(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1505:1506 -> a
-    5:6:void lambda$visitFieldsWithApiLevels$1(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1516:1517 -> a
-    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1514:1514 -> b
-    1:1:com.android.tools.r8.graph.DexType getType():1492:1492 -> getType
+    1:1:void <init>(com.android.tools.r8.utils.InternalOptions$ApiModelTestingOptions,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.ClassReference):1492:1492 -> <init>
+    1:1:com.android.tools.r8.utils.AndroidApiLevel getApiLevel():1500:1500 -> a
+    2:2:void visitMethodsWithApiLevels(java.util.function.BiConsumer):1506:1506 -> a
+    3:4:void lambda$visitMethodsWithApiLevels$0(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.MethodReference,com.android.tools.r8.utils.AndroidApiLevel):1508:1509 -> a
+    5:6:void lambda$visitFieldsWithApiLevels$1(com.android.tools.r8.references.ClassReference,java.util.function.BiConsumer,com.android.tools.r8.graph.DexItemFactory,com.android.tools.r8.references.FieldReference,com.android.tools.r8.utils.AndroidApiLevel):1519:1520 -> a
+    1:1:void visitFieldsWithApiLevels(java.util.function.BiConsumer):1517:1517 -> b
+    1:1:com.android.tools.r8.graph.DexType getType():1495:1495 -> getType
 com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions -> com.android.tools.r8.internal.gu$b:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean enabled -> a
     boolean $assertionsDisabled -> c
-    1:1:void <clinit>():1255:1255 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1255:1257 -> <init>
-    1:1:void disableOptimization():1266:1266 -> a
-    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1286:1286 -> a
-    3:3:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1266:1266 -> a
-    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1288 -> a
-    1:4:boolean isEnabled():1278:1281 -> b
+    1:1:void <clinit>():1258:1258 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1258:1260 -> <init>
+    1:1:void disableOptimization():1269:1269 -> a
+    2:2:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1289:1289 -> a
+    3:3:void com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions.disableOptimization():1269:1269 -> a
+    3:3:com.android.tools.r8.utils.InternalOptions$CallSiteOptimizationOptions setEnabled(boolean):1291 -> a
+    1:4:boolean isEnabled():1281:1284 -> b
 com.android.tools.r8.utils.InternalOptions$ClassInlinerOptions -> com.android.tools.r8.internal.gu$c:
     com.android.tools.r8.utils.InternalOptions this$0 -> b
     boolean $assertionsDisabled -> c
     int classInliningInstructionAllowance -> a
-    1:1:void <clinit>():1294:1294 -> <clinit>
-    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1294:1296 -> <init>
-    1:4:int getClassInliningInstructionAllowance():1299:1302 -> a
-    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    5:5:int getClassInliningInstructionAllowance():1302 -> a
+    1:1:void <clinit>():1297:1297 -> <clinit>
+    1:3:void <init>(com.android.tools.r8.utils.InternalOptions):1297:1299 -> <init>
+    1:4:int getClassInliningInstructionAllowance():1302:1305 -> a
+    5:5:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    5:5:int getClassInliningInstructionAllowance():1305 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    6:6:int getClassInliningInstructionAllowance():1305:1305 -> a
+    6:6:int getClassInliningInstructionAllowance():1308:1308 -> a
 com.android.tools.r8.utils.InternalOptions$DesugarSpecificOptions -> com.android.tools.r8.internal.gu$d:
     boolean sortMethodsOnCfOutput -> a
     boolean allowAllDesugaredInput -> b
     boolean noCfMarkerForDesugaredCode -> c
     boolean lambdaClassFieldsFinal -> d
-    1:15:void <init>():1238:1252 -> <init>
+    1:15:void <init>():1241:1255 -> <init>
 com.android.tools.r8.utils.InternalOptions$DesugarState -> com.android.tools.r8.internal.gu$e:
     com.android.tools.r8.utils.InternalOptions$DesugarState OFF -> b
     com.android.tools.r8.utils.InternalOptions$DesugarState ON -> c
@@ -117890,22 +117903,22 @@
     boolean enableClassInitializerDeadlockDetection -> b
     boolean enableInterfaceMerging -> c
     boolean enableInterfaceMergingInInitial -> d
-    1:1:void <clinit>():1359:1359 -> <clinit>
-    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1359:1372 -> <init>
-    1:1:void disable():1375:1375 -> a
-    2:2:void enableIf(boolean):1387:1387 -> a
-    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1407:1413 -> a
-    1:1:void disableSyntheticMerging():1379:1379 -> b
-    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1426:1432 -> b
-    1:1:void enable():1383:1383 -> c
+    1:1:void <clinit>():1362:1362 -> <clinit>
+    1:14:void <init>(com.android.tools.r8.utils.InternalOptions):1362:1375 -> <init>
+    1:1:void disable():1378:1378 -> a
+    2:2:void enableIf(boolean):1390:1390 -> a
+    3:9:boolean isEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1410:1416 -> a
+    1:1:void disableSyntheticMerging():1382:1382 -> b
+    2:8:boolean isInterfaceMergingEnabled(com.android.tools.r8.horizontalclassmerging.HorizontalClassMerger$Mode):1429:1435 -> b
+    1:1:void enable():1386:1386 -> c
     int getMaxClassGroupSize() -> d
-    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1403:1403 -> e
-    1:1:boolean isRestrictedToSynthetics():1437:1437 -> f
-    1:1:boolean isSyntheticMergingEnabled():1422:1422 -> g
-    1:1:void setEnableClassInitializerDeadlockDetection():1441:1441 -> h
-    1:1:void setEnableInterfaceMerging():1445:1445 -> i
-    1:1:void setEnableInterfaceMergingInInitial():1449:1449 -> j
-    1:1:void setRestrictToSynthetics():1457:1457 -> k
+    1:1:boolean isClassInitializerDeadlockDetectionEnabled():1406:1406 -> e
+    1:1:boolean isRestrictedToSynthetics():1440:1440 -> f
+    1:1:boolean isSyntheticMergingEnabled():1425:1425 -> g
+    1:1:void setEnableClassInitializerDeadlockDetection():1444:1444 -> h
+    1:1:void setEnableInterfaceMerging():1448:1448 -> i
+    1:1:void setEnableInterfaceMergingInInitial():1452:1452 -> j
+    1:1:void setRestrictToSynthetics():1460:1460 -> k
 com.android.tools.r8.utils.InternalOptions$InlinerOptions -> com.android.tools.r8.internal.gu$g:
     boolean $assertionsDisabled -> m
     boolean enableInliningOfInvokesWithClassInitializationSideEffects -> i
@@ -117920,21 +117933,21 @@
     int[] multiCallerInliningInstructionLimits -> c
     boolean applyInliningToInlinee -> g
     boolean enableInlining -> a
-    1:1:void <clinit>():1310:1310 -> <clinit>
-    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1310:1342 -> <init>
-    1:5:int getSimpleInliningInstructionLimit():1346:1350 -> a
-    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
-    6:6:int getSimpleInliningInstructionLimit():1350 -> a
+    1:1:void <clinit>():1313:1313 -> <clinit>
+    1:33:void <init>(com.android.tools.r8.utils.InternalOptions):1313:1345 -> <init>
+    1:5:int getSimpleInliningInstructionLimit():1349:1353 -> a
+    6:6:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
+    6:6:int getSimpleInliningInstructionLimit():1353 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
-    7:7:int getSimpleInliningInstructionLimit():1354:1354 -> a
+    7:7:int getSimpleInliningInstructionLimit():1357:1357 -> a
 com.android.tools.r8.utils.InternalOptions$InvalidParameterAnnotationInfo -> com.android.tools.r8.internal.hu:
     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):828:831 -> <init>
+    1:4:void <init>(com.android.tools.r8.graph.DexMethod,int,int):831:834 -> <init>
 com.android.tools.r8.utils.InternalOptions$KotlinOptimizationOptions -> com.android.tools.r8.internal.iu:
     boolean disableKotlinSpecificOptimizations -> a
-    1:3:void <init>():1231:1233 -> <init>
+    1:3:void <init>():1234:1236 -> <init>
 com.android.tools.r8.utils.InternalOptions$LineNumberOptimization -> com.android.tools.r8.internal.gu$h:
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization OFF -> b
     com.android.tools.r8.utils.InternalOptions$LineNumberOptimization ON -> c
@@ -117945,24 +117958,24 @@
     boolean enabled -> a
     int minSize -> b
     int maxSize -> c
-    1:5:void <init>():1223:1227 -> <init>
+    1:5:void <init>():1226:1230 -> <init>
 com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode -> com.android.tools.r8.internal.gu$j:
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode FLATTEN -> e
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode REPACKAGE -> d
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode MINIFICATION -> c
     com.android.tools.r8.utils.InternalOptions$PackageObfuscationMode NONE -> b
-    1:8:void <clinit>():1193:1200 -> <clinit>
-    1:1:void <init>(java.lang.String,int):1191:1191 -> <init>
+    1:8:void <clinit>():1196:1203 -> <clinit>
+    1:1:void <init>(java.lang.String,int):1194:1194 -> <init>
 com.android.tools.r8.utils.InternalOptions$ProtoShrinkingOptions -> com.android.tools.r8.internal.gu$k:
     boolean enableEnumLiteProtoShrinking -> e
     boolean enableGeneratedExtensionRegistryShrinking -> a
     boolean enableGeneratedMessageLiteShrinking -> b
     boolean enableGeneratedMessageLiteBuilderShrinking -> c
     boolean traverseOneOfAndRepeatedProtoFields -> d
-    1:7:void <init>():1530:1536 -> <init>
-    1:1:boolean enableRemoveProtoEnumSwitchMap():1550:1550 -> a
-    1:1:boolean isEnumLiteProtoShrinkingEnabled():1561:1561 -> b
-    1:1:boolean isProtoShrinkingEnabled():1554:1554 -> c
+    1:7:void <init>():1533:1539 -> <init>
+    1:1:boolean enableRemoveProtoEnumSwitchMap():1553:1553 -> a
+    1:1:boolean isEnumLiteProtoShrinkingEnabled():1564:1564 -> b
+    1:1:boolean isProtoShrinkingEnabled():1557:1557 -> c
 com.android.tools.r8.utils.InternalOptions$TestingOptions -> com.android.tools.r8.internal.gu$l:
     boolean allowCheckDiscardedErrors -> m
     boolean testEnableTestAssertions -> d0
@@ -118037,23 +118050,23 @@
     boolean invertConditionals -> B
     boolean allowNonAbstractClassesWithAbstractMethods -> i0
     boolean readInputStackMaps -> k0
-    1:177:void <init>():1565:1741 -> <init>
+    1:177:void <init>():1568:1744 -> <init>
     com.android.tools.r8.graph.DexProgramClass lambda$new$0(com.android.tools.r8.graph.AppView,java.lang.Iterable,com.android.tools.r8.graph.DexProgramClass) -> a
     void lambda$new$1(java.util.Deque) -> a
-    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1568:1568 -> a
+    1:1:void allowExperimentClassFileVersion(com.android.tools.r8.utils.InternalOptions):1571:1571 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$MinifierTestingOptions -> com.android.tools.r8.internal.gu$l$a:
     java.util.Comparator interfaceMethodOrdering -> a
-    1:3:void <init>():1712:1714 -> <init>
-    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1718:1719 -> a
-    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1720:1720 -> a
+    1:3:void <init>():1715:1717 -> <init>
+    1:2:java.util.Comparator getInterfaceMethodOrderingOrDefault(java.util.Comparator):1721:1722 -> a
+    3:3:int lambda$getInterfaceMethodOrderingOrDefault$0(com.android.tools.r8.com.google.common.base.Equivalence$Wrapper,com.android.tools.r8.com.google.common.base.Equivalence$Wrapper):1723:1723 -> a
 com.android.tools.r8.utils.InternalOptions$TestingOptions$ProguardIfRuleEvaluationData -> com.android.tools.r8.internal.gu$l$b:
     int numberOfProguardIfRuleMemberEvaluations -> b
     int numberOfProguardIfRuleClassEvaluations -> a
-    1:4:void <init>():1730:1733 -> <init>
+    1:4:void <init>():1733:1736 -> <init>
 com.android.tools.r8.utils.InternalOptions$TypeVersionPair -> com.android.tools.r8.internal.ju:
     com.android.tools.r8.cf.CfVersion version -> a
     com.android.tools.r8.graph.DexType type -> b
-    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):840:842 -> <init>
+    1:3:void <init>(com.android.tools.r8.cf.CfVersion,com.android.tools.r8.graph.DexType):843:845 -> <init>
 com.android.tools.r8.utils.InternalOutputMode -> com.android.tools.r8.internal.ku:
     com.android.tools.r8.utils.InternalOutputMode ClassFile -> d
     com.android.tools.r8.utils.InternalOutputMode DexIndexed -> b
@@ -118189,12 +118202,12 @@
     63:81:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):403:421 -> a
     82:82:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683:683 -> a
     82:82:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
-    83:83:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():473:473 -> a
+    83:83:boolean com.android.tools.r8.utils.InternalOptions.isGeneratingClassFiles():476:476 -> a
     83:83:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683 -> a
     83:83:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
     84:99:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):683:698 -> a
     84:99:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
-    100:100:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():609:609 -> a
+    100:100:boolean com.android.tools.r8.utils.InternalOptions.isMinificationEnabled():612:612 -> a
     100:100:boolean com.android.tools.r8.shaking.KeepInfoCollection.isMinificationAllowed(com.android.tools.r8.graph.DexReference,com.android.tools.r8.graph.DexDefinitionSupplier,com.android.tools.r8.shaking.GlobalKeepInfoConfiguration):186 -> a
     100:100:boolean com.android.tools.r8.utils.LineNumberOptimizer.verifyMethodsAreKeptDirectlyOrIndirectly(com.android.tools.r8.graph.AppView,java.util.List):698 -> a
     100:100:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):421 -> a
@@ -118228,7 +118241,7 @@
     219:219:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):450 -> a
     220:297:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):869:946 -> a
     220:297:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):450 -> a
-    298:298:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1862:1862 -> a
+    298:298:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1865:1865 -> a
     298:298:java.util.List com.android.tools.r8.utils.LineNumberOptimizer.optimizeDexCodePositions(com.android.tools.r8.graph.DexEncodedMethod,com.android.tools.r8.graph.AppView,com.android.tools.r8.utils.LineNumberOptimizer$PositionRemapper,boolean,boolean):946 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     298:298:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):450 -> a
@@ -118275,7 +118288,7 @@
     437:502:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):515:580 -> a
     503:541:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):572:610 -> a
     542:551:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):609:618 -> a
-    552:552:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1862:1862 -> a
+    552:552:boolean com.android.tools.r8.utils.InternalOptions.allowDiscardingResidualDebugInfo():1865:1865 -> a
     552:552:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):618 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     553:563:com.android.tools.r8.naming.ClassNameMapper run(com.android.tools.r8.graph.AppView,com.android.tools.r8.graph.DexApplication,com.android.tools.r8.utils.AndroidApp,com.android.tools.r8.naming.NamingLens,com.android.tools.r8.utils.OriginalSourceFiles):618:628 -> a
@@ -120677,7 +120690,7 @@
     11:11:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):67 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     12:17:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):74:79 -> a
-    18:18:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):229:229 -> a
+    18:18:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     18:18:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):80 -> a
     19:20:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.ir.code.InvokeMethod,com.android.tools.r8.graph.GraphLens$MethodLookupResult,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):80:81 -> a
     21:23:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):92:94 -> a
@@ -120685,52 +120698,52 @@
     24:24:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):94 -> a
       # {"id":"com.android.tools.r8.rewriteFrame","conditions":["throws(Ljava/lang/NullPointerException;)"],"actions":["removeInnerFrames(1)"]}
     25:28:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):95:98 -> a
-    29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):229:229 -> a
+    29:29:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     29:29:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):97 -> a
     30:31:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.Return,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):99:100 -> a
     32:35:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):111:114 -> a
-    36:36:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):229:229 -> a
+    36:36:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     36:36:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):115 -> a
     37:38:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.InvokeStatic,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):116:117 -> a
     39:41:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):128:130 -> a
-    42:42:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):229:229 -> a
+    42:42:com.android.tools.r8.utils.OptionalBool com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):232:232 -> a
     42:42:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):130 -> a
     43:46:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):131:134 -> a
     47:47:void insertCastsForOperandsIfNeeded(com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.FieldPut,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):132:132 -> a
     48:71:void processWorklist():142:165 -> a
-    72:76:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):191:195 -> a
-    72:76:void processWorklist():166 -> a
+    72:76:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):192:196 -> a
+    72:76:void processWorklist():167 -> a
     77:77:com.android.tools.r8.ir.code.CheckCast$Builder com.android.tools.r8.ir.code.CheckCast.builder():50:50 -> a
-    77:77:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):195 -> a
-    77:77:void processWorklist():166 -> a
-    78:80:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):196:198 -> a
-    78:80:void processWorklist():166 -> a
+    77:77:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):196 -> a
+    77:77:void processWorklist():167 -> a
+    78:80:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):197:199 -> a
+    78:80:void processWorklist():167 -> a
     81:81:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    81:81:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):198 -> a
-    81:81:void processWorklist():166 -> a
+    81:81:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    81:81:void processWorklist():167 -> a
     82:82:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
     82:82:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    82:82:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):198 -> a
-    82:82:void processWorklist():166 -> a
-    83:97:void com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):198:212 -> a
-    83:97:void processWorklist():166 -> a
-    98:100:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):179:181 -> a
-    101:111:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):238:248 -> a
-    112:116:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):220:224 -> a
-    112:116:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):253 -> a
-    117:121:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):254:258 -> a
-    122:122:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
-    122:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):258 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
-    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
-    123:123:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):258 -> a
-    124:124:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):260:260 -> a
-    125:125:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):259:259 -> a
-    126:126:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):249:249 -> a
-    127:127:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):244:244 -> a
-    128:128:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):239:239 -> a
+    82:82:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199 -> a
+    82:82:void processWorklist():167 -> a
+    83:98:com.android.tools.r8.ir.code.InstructionListIterator com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.insertCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.graph.DexType,com.android.tools.r8.ir.code.Instruction,com.android.tools.r8.ir.code.BasicBlockIterator,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.ir.code.InstructionListIterator):199:214 -> a
+    83:98:void processWorklist():167 -> a
+    99:101:void addWorklistItem(com.android.tools.r8.ir.code.Instruction,int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):180:182 -> a
+    102:112:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):241:251 -> a
+    113:117:boolean com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl.isOperandRewrittenWithLens(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,boolean):223:227 -> a
+    113:117:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):256 -> a
+    118:122:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):257:261 -> a
+    123:123:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69:69 -> a
+    123:123:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    124:124:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView,com.android.tools.r8.ir.analysis.type.Nullability):73:73 -> a
+    124:124:com.android.tools.r8.ir.analysis.type.TypeElement com.android.tools.r8.graph.DexType.toTypeElement(com.android.tools.r8.graph.AppView):69 -> a
+    124:124:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):261 -> a
+    125:125:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):263:263 -> a
+    126:126:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):262:262 -> a
+    127:127:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):252:252 -> a
+    128:128:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):247:247 -> a
+    129:129:com.android.tools.r8.utils.OptionalBool needsCastForOperand(com.android.tools.r8.ir.code.Value,com.android.tools.r8.ir.code.BasicBlock,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType,boolean):242:242 -> a
 com.android.tools.r8.verticalclassmerging.InterfaceTypeToClassTypeLensCodeRewriterHelperImpl$WorklistItem -> com.android.tools.r8.internal.Wt:
     com.android.tools.r8.graph.DexType rewrittenType -> c
     com.android.tools.r8.graph.DexType originalType -> b
     int operandIndex -> a
-    1:4:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):269:272 -> <init>
+    1:4:void <init>(int,com.android.tools.r8.graph.DexType,com.android.tools.r8.graph.DexType):272:275 -> <init>