diff --git a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
index f5ae4730670..11bd0104096 100644
--- a/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
+++ b/compiler/ir/ir.psi2ir/src/org/jetbrains/kotlin/psi2ir/generators/BodyGenerator.kt
@@ -69,6 +69,7 @@ internal class BodyGenerator(
                     context.irBuiltIns.nothingType,
                     ktBody::class.java.simpleName
                 )
+            // For implicit returns, use the expression endOffset to generate the expected line number for debugging.
             irBlockBody.statements.add(generateReturnExpression(irBody.endOffset, irBody.endOffset, irBody))
             return irBlockBody
         }
@@ -81,6 +82,7 @@ internal class BodyGenerator(
             val irBody = statementGenerator.generateStatement(ktBody)
             irBlockBody.statements.add(
                 if (ktBody.isUsedAsExpression(context.bindingContext) && irBody is IrExpression)
+                    // For implicit returns, use the expression endOffset to generate the expected line number for debugging.
                     generateReturnExpression(irBody.endOffset, irBody.endOffset, irBody)
                 else
                     irBody
@@ -128,7 +130,8 @@ internal class BodyGenerator(
                     irReturnedValue is IrExpression &&
                     irReturnedValue !is IrReturn && irReturnedValue !is IrThrow
                 ) {
-                    generateReturnExpression(irReturnedValue.startOffset, irReturnedValue.endOffset, irReturnedValue)
+                    // For implicit returns, use the expression endOffset to generate the expected line number for debugging.
+                    generateReturnExpression(irReturnedValue.endOffset, irReturnedValue.endOffset, irReturnedValue)
                 } else {
                     irReturnedValue
                 }
diff --git a/compiler/testData/codegen/box/coroutines/kt51530.jvm_abi.txt b/compiler/testData/codegen/box/coroutines/kt51530.jvm_abi.txt
deleted file mode 100644
index 0f2a9219bcd..00000000000
--- a/compiler/testData/codegen/box/coroutines/kt51530.jvm_abi.txt
+++ /dev/null
@@ -1,1942 +0,0 @@
-MODULE main
-	CLASS Kt51530Kt$aggregate$$inlined$mapNotNull$1$2.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				kt51530.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 kt51530.kt
-				Kt51530Kt$transform$1$collect$2
-				+ 2 kt51530.kt
-				Kt51530Kt
-				+ 3 _Collections.kt
-				kotlin/collections/CollectionsKt___CollectionsKt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,218:1
-				27#2,7:219
-				34#2:239
-				35#2:253
-				36#2:267
-				37#2:281
-				38#2:295
-				39#2:309
-				40#2:323
-				41#2:337
-				42#2:351
-				43#2:365
-				44#2:379
-				45#2:393
-				46#2:407
-				47#2:421
-				48#2:435
-				49#2:449
-				50#2:463
-				51#2:477
-				52#2:491
-				53#2:505
-				54#2:519
-				55#2:533
-				56#2:547
-				57#2:561
-				58#2:575
-				59#2:589
-				60#2:603
-				61#2:617
-				62#2:631
-				63#2:645
-				64#2:659
-				65#2:673
-				66#2:687
-				67#2:701
-				68#2:715
-				69#2:729
-				70#2:743
-				71#2:757
-				72#2:771
-				73#2:785
-				74#2:799
-				75#2:813
-				76#2:827
-				77#2:841
-				78#2:855
-				79#2:869
-				80#2:883
-				81#2:897
-				82#2:911
-				83#2:925
-				84#2:939
-				85#2:953
-				86#2:967
-				87#2:981
-				88#2:995
-				89#2:1009
-				90#2:1023
-				91#2:1037
-				92#2:1051
-				93#2:1065
-				94#2:1079
-				95#2:1093
-				96#2:1107
-				97#2:1121
-				98#2:1135
-				99#2:1149
-				100#2:1163
-				101#2:1177
-				102#2:1191
-				103#2:1205
-				104#2:1219
-				105#2:1233
-				106#2:1247
-				107#2:1261
-				108#2:1275
-				109#2:1289
-				110#2:1303
-				111#2:1317
-				112#2:1331
-				113#2:1345
-				114#2:1359
-				115#2:1373
-				116#2:1387
-				117#2:1401
-				118#2:1415
-				1601#3,9:226
-				1853#3:235
-				1854#3:237
-				1610#3:238
-				1601#3,9:240
-				1853#3:249
-				1854#3:251
-				1610#3:252
-				1601#3,9:254
-				1853#3:263
-				1854#3:265
-				1610#3:266
-				1601#3,9:268
-				1853#3:277
-				1854#3:279
-				1610#3:280
-				1601#3,9:282
-				1853#3:291
-				1854#3:293
-				1610#3:294
-				1601#3,9:296
-				1853#3:305
-				1854#3:307
-				1610#3:308
-				1601#3,9:310
-				1853#3:319
-				1854#3:321
-				1610#3:322
-				1601#3,9:324
-				1853#3:333
-				1854#3:335
-				1610#3:336
-				1601#3,9:338
-				1853#3:347
-				1854#3:349
-				1610#3:350
-				1601#3,9:352
-				1853#3:361
-				1854#3:363
-				1610#3:364
-				1601#3,9:366
-				1853#3:375
-				1854#3:377
-				1610#3:378
-				1601#3,9:380
-				1853#3:389
-				1854#3:391
-				1610#3:392
-				1601#3,9:394
-				1853#3:403
-				1854#3:405
-				1610#3:406
-				1601#3,9:408
-				1853#3:417
-				1854#3:419
-				1610#3:420
-				1601#3,9:422
-				1853#3:431
-				1854#3:433
-				1610#3:434
-				1601#3,9:436
-				1853#3:445
-				1854#3:447
-				1610#3:448
-				1601#3,9:450
-				1853#3:459
-				1854#3:461
-				1610#3:462
-				1601#3,9:464
-				1853#3:473
-				1854#3:475
-				1610#3:476
-				1601#3,9:478
-				1853#3:487
-				1854#3:489
-				1610#3:490
-				1601#3,9:492
-				1853#3:501
-				1854#3:503
-				1610#3:504
-				1601#3,9:506
-				1853#3:515
-				1854#3:517
-				1610#3:518
-				1601#3,9:520
-				1853#3:529
-				1854#3:531
-				1610#3:532
-				1601#3,9:534
-				1853#3:543
-				1854#3:545
-				1610#3:546
-				1601#3,9:548
-				1853#3:557
-				1854#3:559
-				1610#3:560
-				1601#3,9:562
-				1853#3:571
-				1854#3:573
-				1610#3:574
-				1601#3,9:576
-				1853#3:585
-				1854#3:587
-				1610#3:588
-				1601#3,9:590
-				1853#3:599
-				1854#3:601
-				1610#3:602
-				1601#3,9:604
-				1853#3:613
-				1854#3:615
-				1610#3:616
-				1601#3,9:618
-				1853#3:627
-				1854#3:629
-				1610#3:630
-				1601#3,9:632
-				1853#3:641
-				1854#3:643
-				1610#3:644
-				1601#3,9:646
-				1853#3:655
-				1854#3:657
-				1610#3:658
-				1601#3,9:660
-				1853#3:669
-				1854#3:671
-				1610#3:672
-				1601#3,9:674
-				1853#3:683
-				1854#3:685
-				1610#3:686
-				1601#3,9:688
-				1853#3:697
-				1854#3:699
-				1610#3:700
-				1601#3,9:702
-				1853#3:711
-				1854#3:713
-				1610#3:714
-				1601#3,9:716
-				1853#3:725
-				1854#3:727
-				1610#3:728
-				1601#3,9:730
-				1853#3:739
-				1854#3:741
-				1610#3:742
-				1601#3,9:744
-				1853#3:753
-				1854#3:755
-				1610#3:756
-				1601#3,9:758
-				1853#3:767
-				1854#3:769
-				1610#3:770
-				1601#3,9:772
-				1853#3:781
-				1854#3:783
-				1610#3:784
-				1601#3,9:786
-				1853#3:795
-				1854#3:797
-				1610#3:798
-				1601#3,9:800
-				1853#3:809
-				1854#3:811
-				1610#3:812
-				1601#3,9:814
-				1853#3:823
-				1854#3:825
-				1610#3:826
-				1601#3,9:828
-				1853#3:837
-				1854#3:839
-				1610#3:840
-				1601#3,9:842
-				1853#3:851
-				1854#3:853
-				1610#3:854
-				1601#3,9:856
-				1853#3:865
-				1854#3:867
-				1610#3:868
-				1601#3,9:870
-				1853#3:879
-				1854#3:881
-				1610#3:882
-				1601#3,9:884
-				1853#3:893
-				1854#3:895
-				1610#3:896
-				1601#3,9:898
-				1853#3:907
-				1854#3:909
-				1610#3:910
-				1601#3,9:912
-				1853#3:921
-				1854#3:923
-				1610#3:924
-				1601#3,9:926
-				1853#3:935
-				1854#3:937
-				1610#3:938
-				1601#3,9:940
-				1853#3:949
-				1854#3:951
-				1610#3:952
-				1601#3,9:954
-				1853#3:963
-				1854#3:965
-				1610#3:966
-				1601#3,9:968
-				1853#3:977
-				1854#3:979
-				1610#3:980
-				1601#3,9:982
-				1853#3:991
-				1854#3:993
-				1610#3:994
-				1601#3,9:996
-				1853#3:1005
-				1854#3:1007
-				1610#3:1008
-				1601#3,9:1010
-				1853#3:1019
-				1854#3:1021
-				1610#3:1022
-				1601#3,9:1024
-				1853#3:1033
-				1854#3:1035
-				1610#3:1036
-				1601#3,9:1038
-				1853#3:1047
-				1854#3:1049
-				1610#3:1050
-				1601#3,9:1052
-				1853#3:1061
-				1854#3:1063
-				1610#3:1064
-				1601#3,9:1066
-				1853#3:1075
-				1854#3:1077
-				1610#3:1078
-				1601#3,9:1080
-				1853#3:1089
-				1854#3:1091
-				1610#3:1092
-				1601#3,9:1094
-				1853#3:1103
-				1854#3:1105
-				1610#3:1106
-				1601#3,9:1108
-				1853#3:1117
-				1854#3:1119
-				1610#3:1120
-				1601#3,9:1122
-				1853#3:1131
-				1854#3:1133
-				1610#3:1134
-				1601#3,9:1136
-				1853#3:1145
-				1854#3:1147
-				1610#3:1148
-				1601#3,9:1150
-				1853#3:1159
-				1854#3:1161
-				1610#3:1162
-				1601#3,9:1164
-				1853#3:1173
-				1854#3:1175
-				1610#3:1176
-				1601#3,9:1178
-				1853#3:1187
-				1854#3:1189
-				1610#3:1190
-				1601#3,9:1192
-				1853#3:1201
-				1854#3:1203
-				1610#3:1204
-				1601#3,9:1206
-				1853#3:1215
-				1854#3:1217
-				1610#3:1218
-				1601#3,9:1220
-				1853#3:1229
-				1854#3:1231
-				1610#3:1232
-				1601#3,9:1234
-				1853#3:1243
-				1854#3:1245
-				1610#3:1246
-				1601#3,9:1248
-				1853#3:1257
-				1854#3:1259
-				1610#3:1260
-				1601#3,9:1262
-				1853#3:1271
-				1854#3:1273
-				1610#3:1274
-				1601#3,9:1276
-				1853#3:1285
-				1854#3:1287
-				1610#3:1288
-				1601#3,9:1290
-				1853#3:1299
-				1854#3:1301
-				1610#3:1302
-				1601#3,9:1304
-				1853#3:1313
-				1854#3:1315
-				1610#3:1316
-				1601#3,9:1318
-				1853#3:1327
-				1854#3:1329
-				1610#3:1330
-				1601#3,9:1332
-				1853#3:1341
-				1854#3:1343
-				1610#3:1344
-				1601#3,9:1346
-				1853#3:1355
-				1854#3:1357
-				1610#3:1358
-				1601#3,9:1360
-				1853#3:1369
-				1854#3:1371
-				1610#3:1372
-				1601#3,9:1374
-				1853#3:1383
-				1854#3:1385
-				1610#3:1386
-				1601#3,9:1388
-				1853#3:1397
-				1854#3:1399
-				1610#3:1400
-				1601#3,9:1402
-				1853#3:1411
-				1854#3:1413
-				1610#3:1414
-				1601#3,9:1416
-				1853#3:1425
-				1854#3:1427
-				1610#3:1428
-				1#4:236
-				1#4:250
-				1#4:264
-				1#4:278
-				1#4:292
-				1#4:306
-				1#4:320
-				1#4:334
-				1#4:348
-				1#4:362
-				1#4:376
-				1#4:390
-				1#4:404
-				1#4:418
-				1#4:432
-				1#4:446
-				1#4:460
-				1#4:474
-				1#4:488
-				1#4:502
-				1#4:516
-				1#4:530
-				1#4:544
-				1#4:558
-				1#4:572
-				1#4:586
-				1#4:600
-				1#4:614
-				1#4:628
-				1#4:642
-				1#4:656
-				1#4:670
-				1#4:684
-				1#4:698
-				1#4:712
-				1#4:726
-				1#4:740
-				1#4:754
-				1#4:768
-				1#4:782
-				1#4:796
-				1#4:810
-				1#4:824
-				1#4:838
-				1#4:852
-				1#4:866
-				1#4:880
-				1#4:894
-				1#4:908
-				1#4:922
-				1#4:936
-				1#4:950
-				1#4:964
-				1#4:978
-				1#4:992
-				1#4:1006
-				1#4:1020
-				1#4:1034
-				1#4:1048
-				1#4:1062
-				1#4:1076
-				1#4:1090
-				1#4:1104
-				1#4:1118
-				1#4:1132
-				1#4:1146
-				1#4:1160
-				1#4:1174
-				1#4:1188
-				1#4:1202
-				1#4:1216
-				1#4:1230
-				1#4:1244
-				1#4:1258
-				1#4:1272
-				1#4:1286
-				1#4:1300
-				1#4:1314
-				1#4:1328
-				1#4:1342
-				1#4:1356
-				1#4:1370
-				1#4:1384
-				1#4:1398
-				1#4:1412
-				1#4:1426
-				*S KotlinDebug
-				*F
-				+ 1 kt51530.kt
-				Kt51530Kt
-				*L
-				33#1:226,9
-				33#1:235
-				33#1:237
-				33#1:238
-				34#1:240,9
-				34#1:249
-				34#1:251
-				34#1:252
-				35#1:254,9
-				35#1:263
-				35#1:265
-				35#1:266
-				36#1:268,9
-				36#1:277
-				36#1:279
-				36#1:280
-				37#1:282,9
-				37#1:291
-				37#1:293
-				37#1:294
-				38#1:296,9
-				38#1:305
-				38#1:307
-				38#1:308
-				39#1:310,9
-				39#1:319
-				39#1:321
-				39#1:322
-				40#1:324,9
-				40#1:333
-				40#1:335
-				40#1:336
-				41#1:338,9
-				41#1:347
-				41#1:349
-				41#1:350
-				42#1:352,9
-				42#1:361
-				42#1:363
-				42#1:364
-				43#1:366,9
-				43#1:375
-				43#1:377
-				43#1:378
-				44#1:380,9
-				44#1:389
-				44#1:391
-				44#1:392
-				45#1:394,9
-				45#1:403
-				45#1:405
-				45#1:406
-				46#1:408,9
-				46#1:417
-				46#1:419
-				46#1:420
-				47#1:422,9
-				47#1:431
-				47#1:433
-				47#1:434
-				48#1:436,9
-				48#1:445
-				48#1:447
-				48#1:448
-				49#1:450,9
-				49#1:459
-				49#1:461
-				49#1:462
-				50#1:464,9
-				50#1:473
-				50#1:475
-				50#1:476
-				51#1:478,9
-				51#1:487
-				51#1:489
-				51#1:490
-				52#1:492,9
-				52#1:501
-				52#1:503
-				52#1:504
-				53#1:506,9
-				53#1:515
-				53#1:517
-				53#1:518
-				54#1:520,9
-				54#1:529
-				54#1:531
-				54#1:532
-				55#1:534,9
-				55#1:543
-				55#1:545
-				55#1:546
-				56#1:548,9
-				56#1:557
-				56#1:559
-				56#1:560
-				57#1:562,9
-				57#1:571
-				57#1:573
-				57#1:574
-				58#1:576,9
-				58#1:585
-				58#1:587
-				58#1:588
-				59#1:590,9
-				59#1:599
-				59#1:601
-				59#1:602
-				60#1:604,9
-				60#1:613
-				60#1:615
-				60#1:616
-				61#1:618,9
-				61#1:627
-				61#1:629
-				61#1:630
-				62#1:632,9
-				62#1:641
-				62#1:643
-				62#1:644
-				63#1:646,9
-				63#1:655
-				63#1:657
-				63#1:658
-				64#1:660,9
-				64#1:669
-				64#1:671
-				64#1:672
-				65#1:674,9
-				65#1:683
-				65#1:685
-				65#1:686
-				66#1:688,9
-				66#1:697
-				66#1:699
-				66#1:700
-				67#1:702,9
-				67#1:711
-				67#1:713
-				67#1:714
-				68#1:716,9
-				68#1:725
-				68#1:727
-				68#1:728
-				69#1:730,9
-				69#1:739
-				69#1:741
-				69#1:742
-				70#1:744,9
-				70#1:753
-				70#1:755
-				70#1:756
-				71#1:758,9
-				71#1:767
-				71#1:769
-				71#1:770
-				72#1:772,9
-				72#1:781
-				72#1:783
-				72#1:784
-				73#1:786,9
-				73#1:795
-				73#1:797
-				73#1:798
-				74#1:800,9
-				74#1:809
-				74#1:811
-				74#1:812
-				75#1:814,9
-				75#1:823
-				75#1:825
-				75#1:826
-				76#1:828,9
-				76#1:837
-				76#1:839
-				76#1:840
-				77#1:842,9
-				77#1:851
-				77#1:853
-				77#1:854
-				78#1:856,9
-				78#1:865
-				78#1:867
-				78#1:868
-				79#1:870,9
-				79#1:879
-				79#1:881
-				79#1:882
-				80#1:884,9
-				80#1:893
-				80#1:895
-				80#1:896
-				81#1:898,9
-				81#1:907
-				81#1:909
-				81#1:910
-				82#1:912,9
-				82#1:921
-				82#1:923
-				82#1:924
-				83#1:926,9
-				83#1:935
-				83#1:937
-				83#1:938
-				84#1:940,9
-				84#1:949
-				84#1:951
-				84#1:952
-				85#1:954,9
-				85#1:963
-				85#1:965
-				85#1:966
-				86#1:968,9
-				86#1:977
-				86#1:979
-				86#1:980
-				87#1:982,9
-				87#1:991
-				87#1:993
-				87#1:994
-				88#1:996,9
-				88#1:1005
-				88#1:1007
-				88#1:1008
-				89#1:1010,9
-				89#1:1019
-				89#1:1021
-				89#1:1022
-				90#1:1024,9
-				90#1:1033
-				90#1:1035
-				90#1:1036
-				91#1:1038,9
-				91#1:1047
-				91#1:1049
-				91#1:1050
-				92#1:1052,9
-				92#1:1061
-				92#1:1063
-				92#1:1064
-				93#1:1066,9
-				93#1:1075
-				93#1:1077
-				93#1:1078
-				94#1:1080,9
-				94#1:1089
-				94#1:1091
-				94#1:1092
-				95#1:1094,9
-				95#1:1103
-				95#1:1105
-				95#1:1106
-				96#1:1108,9
-				96#1:1117
-				96#1:1119
-				96#1:1120
-				97#1:1122,9
-				97#1:1131
-				97#1:1133
-				97#1:1134
-				98#1:1136,9
-				98#1:1145
-				98#1:1147
-				98#1:1148
-				99#1:1150,9
-				99#1:1159
-				99#1:1161
-				99#1:1162
-				100#1:1164,9
-				100#1:1173
-				100#1:1175
-				100#1:1176
-				101#1:1178,9
-				101#1:1187
-				101#1:1189
-				101#1:1190
-				102#1:1192,9
-				102#1:1201
-				102#1:1203
-				102#1:1204
-				103#1:1206,9
-				103#1:1215
-				103#1:1217
-				103#1:1218
-				104#1:1220,9
-				104#1:1229
-				104#1:1231
-				104#1:1232
-				105#1:1234,9
-				105#1:1243
-				105#1:1245
-				105#1:1246
-				106#1:1248,9
-				106#1:1257
-				106#1:1259
-				106#1:1260
-				107#1:1262,9
-				107#1:1271
-				107#1:1273
-				107#1:1274
-				108#1:1276,9
-				108#1:1285
-				108#1:1287
-				108#1:1288
-				109#1:1290,9
-				109#1:1299
-				109#1:1301
-				109#1:1302
-				110#1:1304,9
-				110#1:1313
-				110#1:1315
-				110#1:1316
-				111#1:1318,9
-				111#1:1327
-				111#1:1329
-				111#1:1330
-				112#1:1332,9
-				112#1:1341
-				112#1:1343
-				112#1:1344
-				113#1:1346,9
-				113#1:1355
-				113#1:1357
-				113#1:1358
-				114#1:1360,9
-				114#1:1369
-				114#1:1371
-				114#1:1372
-				115#1:1374,9
-				115#1:1383
-				115#1:1385
-				115#1:1386
-				116#1:1388,9
-				116#1:1397
-				116#1:1399
-				116#1:1400
-				117#1:1402,9
-				117#1:1411
-				117#1:1413
-				117#1:1414
-				118#1:1416,9
-				118#1:1425
-				118#1:1427
-				118#1:1428
-				33#1:236
-				34#1:250
-				35#1:264
-				36#1:278
-				37#1:292
-				38#1:306
-				39#1:320
-				40#1:334
-				41#1:348
-				42#1:362
-				43#1:376
-				44#1:390
-				45#1:404
-				46#1:418
-				47#1:432
-				48#1:446
-				49#1:460
-				50#1:474
-				51#1:488
-				52#1:502
-				53#1:516
-				54#1:530
-				55#1:544
-				56#1:558
-				57#1:572
-				58#1:586
-				59#1:600
-				60#1:614
-				61#1:628
-				62#1:642
-				63#1:656
-				64#1:670
-				65#1:684
-				66#1:698
-				67#1:712
-				68#1:726
-				69#1:740
-				70#1:754
-				71#1:768
-				72#1:782
-				73#1:796
-				74#1:810
-				75#1:824
-				76#1:838
-				77#1:852
-				78#1:866
-				79#1:880
-				80#1:894
-				81#1:908
-				82#1:922
-				83#1:936
-				84#1:950
-				85#1:964
-				86#1:978
-				87#1:992
-				88#1:1006
-				89#1:1020
-				90#1:1034
-				91#1:1048
-				92#1:1062
-				93#1:1076
-				94#1:1090
-				95#1:1104
-				96#1:1118
-				97#1:1132
-				98#1:1146
-				99#1:1160
-				100#1:1174
-				101#1:1188
-				102#1:1202
-				103#1:1216
-				104#1:1230
-				105#1:1244
-				106#1:1258
-				107#1:1272
-				108#1:1286
-				109#1:1300
-				110#1:1314
-				111#1:1328
-				112#1:1342
-				113#1:1356
-				114#1:1370
-				115#1:1384
-				116#1:1398
-				117#1:1412
-				118#1:1426
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				kt51530.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 kt51530.kt
-				Kt51530Kt$transform$1$collect$2
-				+ 2 kt51530.kt
-				Kt51530Kt
-				+ 3 _Collections.kt
-				kotlin/collections/CollectionsKt___CollectionsKt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,218:1
-				27#2,7:219
-				34#2:239
-				35#2:253
-				36#2:267
-				37#2:281
-				38#2:295
-				39#2:309
-				40#2:323
-				41#2:337
-				42#2:351
-				43#2:365
-				44#2:379
-				45#2:393
-				46#2:407
-				47#2:421
-				48#2:435
-				49#2:449
-				50#2:463
-				51#2:477
-				52#2:491
-				53#2:505
-				54#2:519
-				55#2:533
-				56#2:547
-				57#2:561
-				58#2:575
-				59#2:589
-				60#2:603
-				61#2:617
-				62#2:631
-				63#2:645
-				64#2:659
-				65#2:673
-				66#2:687
-				67#2:701
-				68#2:715
-				69#2:729
-				70#2:743
-				71#2:757
-				72#2:771
-				73#2:785
-				74#2:799
-				75#2:813
-				76#2:827
-				77#2:841
-				78#2:855
-				79#2:869
-				80#2:883
-				81#2:897
-				82#2:911
-				83#2:925
-				84#2:939
-				85#2:953
-				86#2:967
-				87#2:981
-				88#2:995
-				89#2:1009
-				90#2:1023
-				91#2:1037
-				92#2:1051
-				93#2:1065
-				94#2:1079
-				95#2:1093
-				96#2:1107
-				97#2:1121
-				98#2:1135
-				99#2:1149
-				100#2:1163
-				101#2:1177
-				102#2:1191
-				103#2:1205
-				104#2:1219
-				105#2:1233
-				106#2:1247
-				107#2:1261
-				108#2:1275
-				109#2:1289
-				110#2:1303
-				111#2:1317
-				112#2:1331
-				113#2:1345
-				114#2:1359
-				115#2:1373
-				116#2:1387
-				117#2:1401
-				118#2:1415
-				119#2:1429
-				1601#3,9:226
-				1853#3:235
-				1854#3:237
-				1610#3:238
-				1601#3,9:240
-				1853#3:249
-				1854#3:251
-				1610#3:252
-				1601#3,9:254
-				1853#3:263
-				1854#3:265
-				1610#3:266
-				1601#3,9:268
-				1853#3:277
-				1854#3:279
-				1610#3:280
-				1601#3,9:282
-				1853#3:291
-				1854#3:293
-				1610#3:294
-				1601#3,9:296
-				1853#3:305
-				1854#3:307
-				1610#3:308
-				1601#3,9:310
-				1853#3:319
-				1854#3:321
-				1610#3:322
-				1601#3,9:324
-				1853#3:333
-				1854#3:335
-				1610#3:336
-				1601#3,9:338
-				1853#3:347
-				1854#3:349
-				1610#3:350
-				1601#3,9:352
-				1853#3:361
-				1854#3:363
-				1610#3:364
-				1601#3,9:366
-				1853#3:375
-				1854#3:377
-				1610#3:378
-				1601#3,9:380
-				1853#3:389
-				1854#3:391
-				1610#3:392
-				1601#3,9:394
-				1853#3:403
-				1854#3:405
-				1610#3:406
-				1601#3,9:408
-				1853#3:417
-				1854#3:419
-				1610#3:420
-				1601#3,9:422
-				1853#3:431
-				1854#3:433
-				1610#3:434
-				1601#3,9:436
-				1853#3:445
-				1854#3:447
-				1610#3:448
-				1601#3,9:450
-				1853#3:459
-				1854#3:461
-				1610#3:462
-				1601#3,9:464
-				1853#3:473
-				1854#3:475
-				1610#3:476
-				1601#3,9:478
-				1853#3:487
-				1854#3:489
-				1610#3:490
-				1601#3,9:492
-				1853#3:501
-				1854#3:503
-				1610#3:504
-				1601#3,9:506
-				1853#3:515
-				1854#3:517
-				1610#3:518
-				1601#3,9:520
-				1853#3:529
-				1854#3:531
-				1610#3:532
-				1601#3,9:534
-				1853#3:543
-				1854#3:545
-				1610#3:546
-				1601#3,9:548
-				1853#3:557
-				1854#3:559
-				1610#3:560
-				1601#3,9:562
-				1853#3:571
-				1854#3:573
-				1610#3:574
-				1601#3,9:576
-				1853#3:585
-				1854#3:587
-				1610#3:588
-				1601#3,9:590
-				1853#3:599
-				1854#3:601
-				1610#3:602
-				1601#3,9:604
-				1853#3:613
-				1854#3:615
-				1610#3:616
-				1601#3,9:618
-				1853#3:627
-				1854#3:629
-				1610#3:630
-				1601#3,9:632
-				1853#3:641
-				1854#3:643
-				1610#3:644
-				1601#3,9:646
-				1853#3:655
-				1854#3:657
-				1610#3:658
-				1601#3,9:660
-				1853#3:669
-				1854#3:671
-				1610#3:672
-				1601#3,9:674
-				1853#3:683
-				1854#3:685
-				1610#3:686
-				1601#3,9:688
-				1853#3:697
-				1854#3:699
-				1610#3:700
-				1601#3,9:702
-				1853#3:711
-				1854#3:713
-				1610#3:714
-				1601#3,9:716
-				1853#3:725
-				1854#3:727
-				1610#3:728
-				1601#3,9:730
-				1853#3:739
-				1854#3:741
-				1610#3:742
-				1601#3,9:744
-				1853#3:753
-				1854#3:755
-				1610#3:756
-				1601#3,9:758
-				1853#3:767
-				1854#3:769
-				1610#3:770
-				1601#3,9:772
-				1853#3:781
-				1854#3:783
-				1610#3:784
-				1601#3,9:786
-				1853#3:795
-				1854#3:797
-				1610#3:798
-				1601#3,9:800
-				1853#3:809
-				1854#3:811
-				1610#3:812
-				1601#3,9:814
-				1853#3:823
-				1854#3:825
-				1610#3:826
-				1601#3,9:828
-				1853#3:837
-				1854#3:839
-				1610#3:840
-				1601#3,9:842
-				1853#3:851
-				1854#3:853
-				1610#3:854
-				1601#3,9:856
-				1853#3:865
-				1854#3:867
-				1610#3:868
-				1601#3,9:870
-				1853#3:879
-				1854#3:881
-				1610#3:882
-				1601#3,9:884
-				1853#3:893
-				1854#3:895
-				1610#3:896
-				1601#3,9:898
-				1853#3:907
-				1854#3:909
-				1610#3:910
-				1601#3,9:912
-				1853#3:921
-				1854#3:923
-				1610#3:924
-				1601#3,9:926
-				1853#3:935
-				1854#3:937
-				1610#3:938
-				1601#3,9:940
-				1853#3:949
-				1854#3:951
-				1610#3:952
-				1601#3,9:954
-				1853#3:963
-				1854#3:965
-				1610#3:966
-				1601#3,9:968
-				1853#3:977
-				1854#3:979
-				1610#3:980
-				1601#3,9:982
-				1853#3:991
-				1854#3:993
-				1610#3:994
-				1601#3,9:996
-				1853#3:1005
-				1854#3:1007
-				1610#3:1008
-				1601#3,9:1010
-				1853#3:1019
-				1854#3:1021
-				1610#3:1022
-				1601#3,9:1024
-				1853#3:1033
-				1854#3:1035
-				1610#3:1036
-				1601#3,9:1038
-				1853#3:1047
-				1854#3:1049
-				1610#3:1050
-				1601#3,9:1052
-				1853#3:1061
-				1854#3:1063
-				1610#3:1064
-				1601#3,9:1066
-				1853#3:1075
-				1854#3:1077
-				1610#3:1078
-				1601#3,9:1080
-				1853#3:1089
-				1854#3:1091
-				1610#3:1092
-				1601#3,9:1094
-				1853#3:1103
-				1854#3:1105
-				1610#3:1106
-				1601#3,9:1108
-				1853#3:1117
-				1854#3:1119
-				1610#3:1120
-				1601#3,9:1122
-				1853#3:1131
-				1854#3:1133
-				1610#3:1134
-				1601#3,9:1136
-				1853#3:1145
-				1854#3:1147
-				1610#3:1148
-				1601#3,9:1150
-				1853#3:1159
-				1854#3:1161
-				1610#3:1162
-				1601#3,9:1164
-				1853#3:1173
-				1854#3:1175
-				1610#3:1176
-				1601#3,9:1178
-				1853#3:1187
-				1854#3:1189
-				1610#3:1190
-				1601#3,9:1192
-				1853#3:1201
-				1854#3:1203
-				1610#3:1204
-				1601#3,9:1206
-				1853#3:1215
-				1854#3:1217
-				1610#3:1218
-				1601#3,9:1220
-				1853#3:1229
-				1854#3:1231
-				1610#3:1232
-				1601#3,9:1234
-				1853#3:1243
-				1854#3:1245
-				1610#3:1246
-				1601#3,9:1248
-				1853#3:1257
-				1854#3:1259
-				1610#3:1260
-				1601#3,9:1262
-				1853#3:1271
-				1854#3:1273
-				1610#3:1274
-				1601#3,9:1276
-				1853#3:1285
-				1854#3:1287
-				1610#3:1288
-				1601#3,9:1290
-				1853#3:1299
-				1854#3:1301
-				1610#3:1302
-				1601#3,9:1304
-				1853#3:1313
-				1854#3:1315
-				1610#3:1316
-				1601#3,9:1318
-				1853#3:1327
-				1854#3:1329
-				1610#3:1330
-				1601#3,9:1332
-				1853#3:1341
-				1854#3:1343
-				1610#3:1344
-				1601#3,9:1346
-				1853#3:1355
-				1854#3:1357
-				1610#3:1358
-				1601#3,9:1360
-				1853#3:1369
-				1854#3:1371
-				1610#3:1372
-				1601#3,9:1374
-				1853#3:1383
-				1854#3:1385
-				1610#3:1386
-				1601#3,9:1388
-				1853#3:1397
-				1854#3:1399
-				1610#3:1400
-				1601#3,9:1402
-				1853#3:1411
-				1854#3:1413
-				1610#3:1414
-				1601#3,9:1416
-				1853#3:1425
-				1854#3:1427
-				1610#3:1428
-				1#4:236
-				1#4:250
-				1#4:264
-				1#4:278
-				1#4:292
-				1#4:306
-				1#4:320
-				1#4:334
-				1#4:348
-				1#4:362
-				1#4:376
-				1#4:390
-				1#4:404
-				1#4:418
-				1#4:432
-				1#4:446
-				1#4:460
-				1#4:474
-				1#4:488
-				1#4:502
-				1#4:516
-				1#4:530
-				1#4:544
-				1#4:558
-				1#4:572
-				1#4:586
-				1#4:600
-				1#4:614
-				1#4:628
-				1#4:642
-				1#4:656
-				1#4:670
-				1#4:684
-				1#4:698
-				1#4:712
-				1#4:726
-				1#4:740
-				1#4:754
-				1#4:768
-				1#4:782
-				1#4:796
-				1#4:810
-				1#4:824
-				1#4:838
-				1#4:852
-				1#4:866
-				1#4:880
-				1#4:894
-				1#4:908
-				1#4:922
-				1#4:936
-				1#4:950
-				1#4:964
-				1#4:978
-				1#4:992
-				1#4:1006
-				1#4:1020
-				1#4:1034
-				1#4:1048
-				1#4:1062
-				1#4:1076
-				1#4:1090
-				1#4:1104
-				1#4:1118
-				1#4:1132
-				1#4:1146
-				1#4:1160
-				1#4:1174
-				1#4:1188
-				1#4:1202
-				1#4:1216
-				1#4:1230
-				1#4:1244
-				1#4:1258
-				1#4:1272
-				1#4:1286
-				1#4:1300
-				1#4:1314
-				1#4:1328
-				1#4:1342
-				1#4:1356
-				1#4:1370
-				1#4:1384
-				1#4:1398
-				1#4:1412
-				1#4:1426
-				*S KotlinDebug
-				*F
-				+ 1 kt51530.kt
-				Kt51530Kt
-				*L
-				33#1:226,9
-				33#1:235
-				33#1:237
-				33#1:238
-				34#1:240,9
-				34#1:249
-				34#1:251
-				34#1:252
-				35#1:254,9
-				35#1:263
-				35#1:265
-				35#1:266
-				36#1:268,9
-				36#1:277
-				36#1:279
-				36#1:280
-				37#1:282,9
-				37#1:291
-				37#1:293
-				37#1:294
-				38#1:296,9
-				38#1:305
-				38#1:307
-				38#1:308
-				39#1:310,9
-				39#1:319
-				39#1:321
-				39#1:322
-				40#1:324,9
-				40#1:333
-				40#1:335
-				40#1:336
-				41#1:338,9
-				41#1:347
-				41#1:349
-				41#1:350
-				42#1:352,9
-				42#1:361
-				42#1:363
-				42#1:364
-				43#1:366,9
-				43#1:375
-				43#1:377
-				43#1:378
-				44#1:380,9
-				44#1:389
-				44#1:391
-				44#1:392
-				45#1:394,9
-				45#1:403
-				45#1:405
-				45#1:406
-				46#1:408,9
-				46#1:417
-				46#1:419
-				46#1:420
-				47#1:422,9
-				47#1:431
-				47#1:433
-				47#1:434
-				48#1:436,9
-				48#1:445
-				48#1:447
-				48#1:448
-				49#1:450,9
-				49#1:459
-				49#1:461
-				49#1:462
-				50#1:464,9
-				50#1:473
-				50#1:475
-				50#1:476
-				51#1:478,9
-				51#1:487
-				51#1:489
-				51#1:490
-				52#1:492,9
-				52#1:501
-				52#1:503
-				52#1:504
-				53#1:506,9
-				53#1:515
-				53#1:517
-				53#1:518
-				54#1:520,9
-				54#1:529
-				54#1:531
-				54#1:532
-				55#1:534,9
-				55#1:543
-				55#1:545
-				55#1:546
-				56#1:548,9
-				56#1:557
-				56#1:559
-				56#1:560
-				57#1:562,9
-				57#1:571
-				57#1:573
-				57#1:574
-				58#1:576,9
-				58#1:585
-				58#1:587
-				58#1:588
-				59#1:590,9
-				59#1:599
-				59#1:601
-				59#1:602
-				60#1:604,9
-				60#1:613
-				60#1:615
-				60#1:616
-				61#1:618,9
-				61#1:627
-				61#1:629
-				61#1:630
-				62#1:632,9
-				62#1:641
-				62#1:643
-				62#1:644
-				63#1:646,9
-				63#1:655
-				63#1:657
-				63#1:658
-				64#1:660,9
-				64#1:669
-				64#1:671
-				64#1:672
-				65#1:674,9
-				65#1:683
-				65#1:685
-				65#1:686
-				66#1:688,9
-				66#1:697
-				66#1:699
-				66#1:700
-				67#1:702,9
-				67#1:711
-				67#1:713
-				67#1:714
-				68#1:716,9
-				68#1:725
-				68#1:727
-				68#1:728
-				69#1:730,9
-				69#1:739
-				69#1:741
-				69#1:742
-				70#1:744,9
-				70#1:753
-				70#1:755
-				70#1:756
-				71#1:758,9
-				71#1:767
-				71#1:769
-				71#1:770
-				72#1:772,9
-				72#1:781
-				72#1:783
-				72#1:784
-				73#1:786,9
-				73#1:795
-				73#1:797
-				73#1:798
-				74#1:800,9
-				74#1:809
-				74#1:811
-				74#1:812
-				75#1:814,9
-				75#1:823
-				75#1:825
-				75#1:826
-				76#1:828,9
-				76#1:837
-				76#1:839
-				76#1:840
-				77#1:842,9
-				77#1:851
-				77#1:853
-				77#1:854
-				78#1:856,9
-				78#1:865
-				78#1:867
-				78#1:868
-				79#1:870,9
-				79#1:879
-				79#1:881
-				79#1:882
-				80#1:884,9
-				80#1:893
-				80#1:895
-				80#1:896
-				81#1:898,9
-				81#1:907
-				81#1:909
-				81#1:910
-				82#1:912,9
-				82#1:921
-				82#1:923
-				82#1:924
-				83#1:926,9
-				83#1:935
-				83#1:937
-				83#1:938
-				84#1:940,9
-				84#1:949
-				84#1:951
-				84#1:952
-				85#1:954,9
-				85#1:963
-				85#1:965
-				85#1:966
-				86#1:968,9
-				86#1:977
-				86#1:979
-				86#1:980
-				87#1:982,9
-				87#1:991
-				87#1:993
-				87#1:994
-				88#1:996,9
-				88#1:1005
-				88#1:1007
-				88#1:1008
-				89#1:1010,9
-				89#1:1019
-				89#1:1021
-				89#1:1022
-				90#1:1024,9
-				90#1:1033
-				90#1:1035
-				90#1:1036
-				91#1:1038,9
-				91#1:1047
-				91#1:1049
-				91#1:1050
-				92#1:1052,9
-				92#1:1061
-				92#1:1063
-				92#1:1064
-				93#1:1066,9
-				93#1:1075
-				93#1:1077
-				93#1:1078
-				94#1:1080,9
-				94#1:1089
-				94#1:1091
-				94#1:1092
-				95#1:1094,9
-				95#1:1103
-				95#1:1105
-				95#1:1106
-				96#1:1108,9
-				96#1:1117
-				96#1:1119
-				96#1:1120
-				97#1:1122,9
-				97#1:1131
-				97#1:1133
-				97#1:1134
-				98#1:1136,9
-				98#1:1145
-				98#1:1147
-				98#1:1148
-				99#1:1150,9
-				99#1:1159
-				99#1:1161
-				99#1:1162
-				100#1:1164,9
-				100#1:1173
-				100#1:1175
-				100#1:1176
-				101#1:1178,9
-				101#1:1187
-				101#1:1189
-				101#1:1190
-				102#1:1192,9
-				102#1:1201
-				102#1:1203
-				102#1:1204
-				103#1:1206,9
-				103#1:1215
-				103#1:1217
-				103#1:1218
-				104#1:1220,9
-				104#1:1229
-				104#1:1231
-				104#1:1232
-				105#1:1234,9
-				105#1:1243
-				105#1:1245
-				105#1:1246
-				106#1:1248,9
-				106#1:1257
-				106#1:1259
-				106#1:1260
-				107#1:1262,9
-				107#1:1271
-				107#1:1273
-				107#1:1274
-				108#1:1276,9
-				108#1:1285
-				108#1:1287
-				108#1:1288
-				109#1:1290,9
-				109#1:1299
-				109#1:1301
-				109#1:1302
-				110#1:1304,9
-				110#1:1313
-				110#1:1315
-				110#1:1316
-				111#1:1318,9
-				111#1:1327
-				111#1:1329
-				111#1:1330
-				112#1:1332,9
-				112#1:1341
-				112#1:1343
-				112#1:1344
-				113#1:1346,9
-				113#1:1355
-				113#1:1357
-				113#1:1358
-				114#1:1360,9
-				114#1:1369
-				114#1:1371
-				114#1:1372
-				115#1:1374,9
-				115#1:1383
-				115#1:1385
-				115#1:1386
-				116#1:1388,9
-				116#1:1397
-				116#1:1399
-				116#1:1400
-				117#1:1402,9
-				117#1:1411
-				117#1:1413
-				117#1:1414
-				118#1:1416,9
-				118#1:1425
-				118#1:1427
-				118#1:1428
-				33#1:236
-				34#1:250
-				35#1:264
-				36#1:278
-				37#1:292
-				38#1:306
-				39#1:320
-				40#1:334
-				41#1:348
-				42#1:362
-				43#1:376
-				44#1:390
-				45#1:404
-				46#1:418
-				47#1:432
-				48#1:446
-				49#1:460
-				50#1:474
-				51#1:488
-				52#1:502
-				53#1:516
-				54#1:530
-				55#1:544
-				56#1:558
-				57#1:572
-				58#1:586
-				59#1:600
-				60#1:614
-				61#1:628
-				62#1:642
-				63#1:656
-				64#1:670
-				65#1:684
-				66#1:698
-				67#1:712
-				68#1:726
-				69#1:740
-				70#1:754
-				71#1:768
-				72#1:782
-				73#1:796
-				74#1:810
-				75#1:824
-				76#1:838
-				77#1:852
-				78#1:866
-				79#1:880
-				80#1:894
-				81#1:908
-				82#1:922
-				83#1:936
-				84#1:950
-				85#1:964
-				86#1:978
-				87#1:992
-				88#1:1006
-				89#1:1020
-				90#1:1034
-				91#1:1048
-				92#1:1062
-				93#1:1076
-				94#1:1090
-				95#1:1104
-				96#1:1118
-				97#1:1132
-				98#1:1146
-				99#1:1160
-				100#1:1174
-				101#1:1188
-				102#1:1202
-				103#1:1216
-				104#1:1230
-				105#1:1244
-				106#1:1258
-				107#1:1272
-				108#1:1286
-				109#1:1300
-				110#1:1314
-				111#1:1328
-				112#1:1342
-				113#1:1356
-				114#1:1370
-				115#1:1384
-				116#1:1398
-				117#1:1412
-				118#1:1426
-				*E
-				 } )
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/coroutines/kt51530.kt b/compiler/testData/codegen/box/coroutines/kt51530.kt
index 5e7d0e9b386..a5a108e1ec0 100644
--- a/compiler/testData/codegen/box/coroutines/kt51530.kt
+++ b/compiler/testData/codegen/box/coroutines/kt51530.kt
@@ -1,8 +1,6 @@
 // WITH_STDLIB
 // IGNORE_BACKEND: JVM
 
-// JVM_ABI_K1_K2_DIFF: KT-62464
-
 import kotlin.coroutines.*
 
 interface Flow<out T> {
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt29595.jvm_abi.txt b/compiler/testData/codegen/boxInline/anonymousObject/kt29595.jvm_abi.txt
deleted file mode 100644
index 44da0183335..00000000000
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt29595.jvm_abi.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-MODULE main
-	CLASS _2Kt$box$$inlined$foo$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$foo$1
-				+ 2 2.kt
-				_2Kt
-				*L
-				1#1,26:1
-				33#2:27
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$foo$1
-				+ 2 2.kt
-				_2Kt
-				*L
-				1#1,26:1
-				33#2,5:27
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt29595.kt b/compiler/testData/codegen/boxInline/anonymousObject/kt29595.kt
index eaf33f2c563..73f667bf6bd 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt29595.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/kt29595.kt
@@ -3,7 +3,6 @@
 // WITH_STDLIB
 // IGNORE_BACKEND: JVM
 // IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_MULTI_MODULE_OLD_AGAINST_IR
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt38197.jvm_abi.txt b/compiler/testData/codegen/boxInline/anonymousObject/kt38197.jvm_abi.txt
deleted file mode 100644
index f0698820d08..00000000000
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt38197.jvm_abi.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-MODULE main
-	CLASS TestKt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				test.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 test.kt
-				TestKt
-				*L
-				1#1,44:1
-				23#1,9:45
-				*S KotlinDebug
-				*F
-				+ 1 test.kt
-				TestKt
-				*L
-				14#1:45,9
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				test.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 test.kt
-				TestKt
-				*L
-				1#1,44:1
-				23#1,18:45
-				*S KotlinDebug
-				*F
-				+ 1 test.kt
-				TestKt
-				*L
-				14#1:45,18
-				*E
-				 } )
-	CLASS BoxKt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				box.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 box.kt
-				BoxKt
-				+ 2 test.kt
-				TestKt
-				*L
-				1#1,56:1
-				14#2,18:57
-				*S KotlinDebug
-				*F
-				+ 1 box.kt
-				BoxKt
-				*L
-				51#1:57,18
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				box.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 box.kt
-				BoxKt
-				+ 2 test.kt
-				TestKt
-				*L
-				1#1,56:1
-				14#2,27:57
-				*S KotlinDebug
-				*F
-				+ 1 box.kt
-				BoxKt
-				*L
-				51#1:57,27
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt38197.kt b/compiler/testData/codegen/boxInline/anonymousObject/kt38197.kt
index 30749ef04ce..c7306075dbb 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt38197.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/kt38197.kt
@@ -1,6 +1,5 @@
 // WITH_COROUTINES
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: test.kt
 
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt51950.jvm_abi.txt b/compiler/testData/codegen/boxInline/anonymousObject/kt51950.jvm_abi.txt
deleted file mode 100644
index d01c43c3c32..00000000000
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt51950.jvm_abi.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-MODULE main
-	CLASS _1Kt$transformMessage$$inlined$decorate$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				_1Kt$decorate$1
-				+ 2 1.kt
-				_1Kt
-				*L
-				1#1,19:1
-				13#2:20
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				_1Kt$decorate$1
-				+ 2 1.kt
-				_1Kt
-				*L
-				1#1,19:1
-				13#2,4:20
-				*E
-				 } )
-	CLASS _2Kt$append$$inlined$transformMessage$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				_1Kt$decorate$1
-				+ 2 1.kt
-				_1Kt
-				*L
-				1#1,19:1
-				13#2:20
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				_1Kt$decorate$1
-				+ 2 1.kt
-				_1Kt
-				*L
-				1#1,19:1
-				13#2,4:20
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/kt51950.kt b/compiler/testData/codegen/boxInline/anonymousObject/kt51950.kt
index 4ba06519b5a..d1c0a02aa36 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/kt51950.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/kt51950.kt
@@ -1,4 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 interface Service {
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.jvm_abi.txt b/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.jvm_abi.txt
deleted file mode 100644
index 145f71010e3..00000000000
--- a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.jvm_abi.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-MODULE main
-	CLASS _2Kt$box$$inlined$switchMapOnce$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$switchMapOnce$2
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,17:1
-				24#2:18
-				14#3,2:19
-				1#4:21
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:19,2
-				24#1:21
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$switchMapOnce$2
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,17:1
-				24#2:18
-				26#2:22
-				14#3,2:19
-				1#4:21
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:19,2
-				24#1:21
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt b/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
index ec817f8eaa6..73581b2c13a 100644
--- a/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
+++ b/compiler/testData/codegen/boxInline/anonymousObject/sam/kt22304.kt
@@ -1,6 +1,5 @@
 // FULL_JDK
 // TARGET_BACKEND: JVM
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.jvm_abi.txt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.jvm_abi.txt
deleted file mode 100644
index 44c38688c6b..00000000000
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.jvm_abi.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-MODULE main
-	CLASS test/_1Kt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				+ 2 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,19:1
-				11#1,5:20
-				12#2:25
-				*S KotlinDebug
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				*L
-				17#1:20,5
-				17#1:25
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				+ 2 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,19:1
-				11#1,5:20
-				12#2,3:25
-				*S KotlinDebug
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				*L
-				17#1:20,5
-				17#1:25,3
-				*E
-				 } )
-	CLASS _2Kt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,27:1
-				11#2,5:28
-				12#3:33
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:28,5
-				24#1:33
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,27:1
-				11#2,5:28
-				12#3,3:33
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:28,5
-				24#1:33,3
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.kt
index 19785ae3067..6a0449b58e9 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkObjectClassIsPresent.kt
@@ -1,5 +1,4 @@
 // NO_CHECK_LAMBDA_INLINING
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 package test
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.jvm_abi.txt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.jvm_abi.txt
deleted file mode 100644
index 0e634b881f7..00000000000
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.jvm_abi.txt
+++ /dev/null
@@ -1,101 +0,0 @@
-MODULE main
-	CLASS test/_1Kt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				+ 2 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,19:1
-				11#1,5:20
-				12#2:25
-				*S KotlinDebug
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				*L
-				17#1:20,5
-				17#1:25
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				+ 2 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,19:1
-				11#1,5:20
-				12#2,3:25
-				*S KotlinDebug
-				*F
-				+ 1 1.kt
-				test/_1Kt
-				*L
-				17#1:20,5
-				17#1:25,3
-				*E
-				 } )
-	CLASS _2Kt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,28:1
-				11#2,5:29
-				12#3:34
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:29,5
-				24#1:34
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,28:1
-				11#2,5:29
-				12#3,3:34
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				24#1:29,5
-				24#1:34,3
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.kt
index a3bb7ef2b4f..5a6c6924974 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/checkStaticObjectClassIsPresent.kt
@@ -1,5 +1,4 @@
 // NO_CHECK_LAMBDA_INLINING
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 package test
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.jvm_abi.txt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.jvm_abi.txt
deleted file mode 100644
index ce6908b82cf..00000000000
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.jvm_abi.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-MODULE main
-	CLASS _2Kt.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,23:1
-				11#2,5:24
-				12#3:29
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				21#1:24,5
-				21#1:29
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				2.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 2.kt
-				_2Kt
-				+ 2 1.kt
-				test/_1Kt
-				+ 3 1.kt
-				test/_1Kt$test$1
-				*L
-				1#1,23:1
-				11#2,5:24
-				12#3,3:29
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				21#1:24,5
-				21#1:29,3
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.kt b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.kt
index 5a7a6a33222..418d8346dc0 100644
--- a/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.kt
+++ b/compiler/testData/codegen/boxInline/defaultValues/lambdaInlining/kt21946.kt
@@ -1,5 +1,4 @@
 // NO_CHECK_LAMBDA_INLINING
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 package test
diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.jvm_abi.txt b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.jvm_abi.txt
deleted file mode 100644
index dde6b7a044b..00000000000
--- a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.jvm_abi.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-MODULE main
-	CLASS _2Kt$box$$inlined$call$2.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,13:1
-				27#2:14
-				9#3:15
-				1#4:16
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				27#1:15
-				27#1:16
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,13:1
-				27#2:14
-				29#2:17
-				9#3:15
-				1#4:16
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				27#1:15
-				27#1:16
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt
index 432700e72dc..ffb9c7aa001 100644
--- a/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt
+++ b/compiler/testData/codegen/boxInline/enclosingInfo/inlineChain2.kt
@@ -1,6 +1,5 @@
 // TARGET_BACKEND: JVM
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.jvm_abi.txt b/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.jvm_abi.txt
deleted file mode 100644
index 586a3b214bb..00000000000
--- a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.jvm_abi.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-MODULE main
-	CLASS InlineSiteKt$abc$$inlined$map$1$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				inlined.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 inlined.kt
-				InlinedKt$collect$2
-				+ 2 inlined.kt
-				InlinedKt$transform$1
-				+ 3 inlined.kt
-				InlinedKt
-				+ 4 inlineSite.kt
-				InlineSiteKt
-				*L
-				1#1,41:1
-				25#2:42
-				30#3:43
-				46#4,4:44
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				inlined.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 inlined.kt
-				InlinedKt$collect$2
-				+ 2 inlined.kt
-				InlinedKt$transform$1
-				+ 3 inlined.kt
-				InlinedKt
-				+ 4 inlineSite.kt
-				InlineSiteKt
-				*L
-				1#1,41:1
-				25#2:42
-				30#3:43
-				46#4,5:44
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt b/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt
index 24b6be68b61..d43f70e310d 100644
--- a/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt
+++ b/compiler/testData/codegen/boxInline/suspend/tryCatchReceiver.kt
@@ -1,7 +1,6 @@
 // WITH_COROUTINES
 // NO_CHECK_LAMBDA_INLINING
 // WITH_STDLIB
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: inlined.kt
 
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.jvm_abi.txt b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.jvm_abi.txt
deleted file mode 100644
index 907d9436fa5..00000000000
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.jvm_abi.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE main
-	CLASS A$test2$$inlined$call$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				A
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,14:1
-				31#2:15
-				11#3:16
-				9#3:18
-				1#4:17
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				A
-				*L
-				31#1:16
-				31#1:18
-				31#1:17
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				A
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,14:1
-				31#2:15
-				33#2:19
-				11#3:16
-				9#3:18
-				1#4:17
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				A
-				*L
-				31#1:16
-				31#1:18
-				31#1:17
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.kt b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.kt
index e62e426e75f..a35f0037bd6 100644
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.kt
+++ b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/privateInCrossInline.kt
@@ -1,5 +1,4 @@
 // NO_CHECK_LAMBDA_INLINING
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.jvm_abi.txt b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.jvm_abi.txt
deleted file mode 100644
index 10202a37c64..00000000000
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.jvm_abi.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-MODULE main
-	CLASS A$test2$$inlined$call$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				A
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,20:1
-				37#2:21
-				10#3:22
-				8#3:24
-				1#4:23
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				A
-				*L
-				37#1:22
-				37#1:24
-				37#1:23
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				A
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,20:1
-				37#2:21
-				39#2:25
-				10#3:22
-				8#3:24
-				1#4:23
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				A
-				*L
-				37#1:22
-				37#1:24
-				37#1:23
-				*E
-				 } )
diff --git a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.kt b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.kt
index af415fd4d58..4c827d658de 100644
--- a/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.kt
+++ b/compiler/testData/codegen/boxInline/syntheticAccessors/withinInlineLambda/superInCrossInline.kt
@@ -1,5 +1,4 @@
 // NO_CHECK_LAMBDA_INLINING
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 package test
diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.jvm_abi.txt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.jvm_abi.txt
deleted file mode 100644
index cc254f7a314..00000000000
--- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.jvm_abi.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-MODULE main
-	CLASS _2Kt$box$$inlined$call$2.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,11:1
-				21#2:12
-				7#3:13
-				1#4:14
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				21#1:13
-				21#1:14
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				1.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 1.kt
-				test/_1Kt$call$1
-				+ 2 2.kt
-				_2Kt
-				+ 3 1.kt
-				test/_1Kt
-				+ 4 fake.kt
-				kotlin/jvm/internal/FakeKt
-				*L
-				1#1,11:1
-				21#2:12
-				23#2:15
-				7#3:13
-				1#4:14
-				*S KotlinDebug
-				*F
-				+ 1 2.kt
-				_2Kt
-				*L
-				21#1:13
-				21#1:14
-				*E
-				 } )
diff --git a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.kt b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.kt
index 7ba54b4b821..b223894ca9b 100644
--- a/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.kt
+++ b/compiler/testData/codegen/bytecodeListing/inline/enclosingInfo/crossinlineLambdaChain.kt
@@ -1,4 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 // FILE: 1.kt
 
diff --git a/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.jvm_abi.txt b/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.jvm_abi.txt
deleted file mode 100644
index 6f9c21fbbd5..00000000000
--- a/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.jvm_abi.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-MODULE main
-	CLASS FinallyMarkersKt$box$$inlined$test$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				finallyMarkers.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 finallyMarkers.kt
-				FinallyMarkersKt$test$1
-				+ 2 finallyMarkers.kt
-				FinallyMarkersKt
-				*L
-				1#1,28:1
-				17#2,3:29
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				finallyMarkers.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 finallyMarkers.kt
-				FinallyMarkersKt$test$1
-				+ 2 finallyMarkers.kt
-				FinallyMarkersKt
-				*L
-				1#1,28:1
-				17#2,4:29
-				*E
-				 } )
-	CLASS FinallyMarkersKt$box$$inlined$test$2.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				finallyMarkers.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 finallyMarkers.kt
-				FinallyMarkersKt$test$3
-				+ 2 finallyMarkers.kt
-				FinallyMarkersKt
-				*L
-				1#1,28:1
-				17#2,3:29
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				finallyMarkers.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 finallyMarkers.kt
-				FinallyMarkersKt$test$3
-				+ 2 finallyMarkers.kt
-				FinallyMarkersKt
-				*L
-				1#1,28:1
-				17#2,4:29
-				*E
-				 } )
diff --git a/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt b/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt
index 151d9238f31..4b981976f2c 100644
--- a/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt
+++ b/compiler/testData/codegen/bytecodeText/inline/finallyMarkers.kt
@@ -1,4 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 inline fun test(crossinline l: () -> String) {
     {
diff --git a/compiler/testData/codegen/bytecodeText/kt48367.jvm_abi.txt b/compiler/testData/codegen/bytecodeText/kt48367.jvm_abi.txt
deleted file mode 100644
index 1ece59d98f8..00000000000
--- a/compiler/testData/codegen/bytecodeText/kt48367.jvm_abi.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-MODULE main
-	CLASS Kt48367Kt$flaf$$inlined$bar$1.class
-		Annotation: class.invisibleAnnotations
-			K1
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				kt48367.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 kt48367.kt
-				Kt48367Kt$bar$1
-				+ 2 kt48367.kt
-				Kt48367Kt
-				*L
-				1#1,23:1
-				9#2,2:24
-				*E
-				 } )
-			K2
-				@Lkotlin/jvm/internal/SourceDebugExtension;( value: #{ SMAP
-				kt48367.kt
-				Kotlin
-				*S Kotlin
-				*F
-				+ 1 kt48367.kt
-				Kt48367Kt$bar$1
-				+ 2 kt48367.kt
-				Kt48367Kt
-				*L
-				1#1,23:1
-				9#2,3:24
-				*E
-				 } )
diff --git a/compiler/testData/codegen/bytecodeText/kt48367.kt b/compiler/testData/codegen/bytecodeText/kt48367.kt
index 0aabad02511..b150b30f7d9 100644
--- a/compiler/testData/codegen/bytecodeText/kt48367.kt
+++ b/compiler/testData/codegen/bytecodeText/kt48367.kt
@@ -1,4 +1,3 @@
-// JVM_ABI_K1_K2_DIFF: KT-62464
 
 fun foo(block: () -> String): String = block()
 inline fun bar(crossinline f: () -> String) = foo { f() }
diff --git a/compiler/testData/debug/stepping/anonymousFunction.kt b/compiler/testData/debug/stepping/anonymousFunction.kt
index 5bcf387304d..423b363641a 100644
--- a/compiler/testData/debug/stepping/anonymousFunction.kt
+++ b/compiler/testData/debug/stepping/anonymousFunction.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun <T> eval(f: () -> T) = f()
@@ -31,7 +31,7 @@ fun box() {
 // test.kt:1 $box
 // test.kt:7 $box
 // test.kt:4 $eval (27, 30)
-// test.kt:8 $box$lambda.invoke (8, 8, 8, 8)
+// test.kt:8 $box$lambda.invoke (8, 8, 8, 8, 12)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
diff --git a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
index 6bafab12394..ac77aa86fb8 100644
--- a/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
+++ b/compiler/testData/debug/stepping/anonymousFunctionDirect.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun box() {
@@ -19,7 +19,7 @@ fun box() {
 // EXPECTATIONS WASM
 // test.kt:1 $box
 // test.kt:5 $box
-// test.kt:6 $box$lambda.invoke (8, 8, 8, 8)
+// test.kt:6 $box$lambda.invoke (8, 8, 8, 8, 12)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
diff --git a/compiler/testData/debug/stepping/lambdaStepInline.kt b/compiler/testData/debug/stepping/lambdaStepInline.kt
index 28c8b4789fc..bca306f4afe 100644
--- a/compiler/testData/debug/stepping/lambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/lambdaStepInline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 inline fun foo(stringMaker: () -> String): String {
@@ -30,7 +30,7 @@ fun box(): String {
 
 // EXPECTATIONS WASM
 // test.kt:1 $box__JsExportAdapter
-// test.kt:9 $box (4, 10, 10, 10, 10)
+// test.kt:9 $box (4, 10, 10, 10, 10, 15)
 // test.kt:5 $box (11, 11, 4, 11, 11, 4)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
@@ -46,7 +46,7 @@ fun box(): String {
 // Array.kt:76 $kotlin.Array.set (5, 5)
 // String.kt:149 $kotlin.stringLiteral (11, 4, 11, 4)
 // test.kt:10 $box
-// test.kt:11 $box (8, 8, 8, 8)
+// test.kt:11 $box (8, 8, 8, 8, 12)
 // test.kt:14 $box (11, 11, 11, 11, 4)
 // String.kt:143 $kotlin.stringLiteral (15, 8)
 // ExternalWrapper.kt:200 $kotlin.wasm.internal.kotlinToJsStringAdapter
diff --git a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
index 3c9605f9dad..b9a97fb337f 100644
--- a/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
+++ b/compiler/testData/debug/stepping/lambdaStepInlineWithDefaults.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 inline fun foo(stringMaker: () -> String = { "OK" }): String {
     return stringMaker()
@@ -37,7 +37,7 @@ fun box(): String {
 // test.kt:1 $box__JsExportAdapter
 // test.kt:15 $box
 // test.kt:4 $box (11, 11, 4)
-// test.kt:3 $box (45, 45, 45, 45)
+// test.kt:3 $box (45, 45, 45, 45, 49)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
@@ -53,7 +53,7 @@ fun box(): String {
 // String.kt:149 $kotlin.stringLiteral (11, 4)
 // test.kt:16 $box
 // test.kt:11 $box (11, 11, 4)
-// test.kt:8 $box (4, 4, 4, 4)
+// test.kt:8 $box (4, 4, 4, 4, 8)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
 // test.kt:17 $box (11, 11, 11, 11, 4)
 // ExternalWrapper.kt:200 $kotlin.wasm.internal.kotlinToJsStringAdapter
diff --git a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
index 4f5802095a4..dc657c8a5a7 100644
--- a/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
+++ b/compiler/testData/debug/stepping/noParametersArgumentCallInExpression.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 
 // FILE: test.kt
 
@@ -32,5 +32,5 @@ inline fun lookAtMe(f: () -> Int) {
 // test.kt:6 $box
 // test.kt:12 $box
 // test.kt:13 $box (4, 8, 4, 4)
-// test.kt:7 $box (8, 8)
+// test.kt:7 $box (8, 10)
 // test.kt:9 $box
diff --git a/compiler/testData/debug/stepping/voidLambdaStepInline.kt b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
index c5a050e22b3..0251c69a405 100644
--- a/compiler/testData/debug/stepping/voidLambdaStepInline.kt
+++ b/compiler/testData/debug/stepping/voidLambdaStepInline.kt
@@ -1,4 +1,4 @@
-// IGNORE_BACKEND_K2: WASM
+
 // FILE: test.kt
 
 fun box(): String {
@@ -26,7 +26,7 @@ fun box(): String {
 // test.kt:5 $box
 // Standard.kt:41 $box (4, 4)
 // Standard.kt:44 $box (11, 11, 11, 4, 11, 11, 11, 4)
-// Standard.kt:2 $box (72, 72, 72, 72)
+// Standard.kt:2 $box (46, 46, 46, 46, 55, 76, 76, 76, 76, 85)
 // String.kt:141 $kotlin.stringLiteral (17, 28, 17, 17, 28, 17, 17, 28, 17)
 // Array.kt:59 $kotlin.Array.get (19, 26, 34, 8, 19, 26, 34, 8, 19, 26, 34, 8)
 // ThrowHelpers.kt:29 $kotlin.wasm.internal.rangeCheck (6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19, 6, 14, 6, 19, 28, 19)
@@ -41,7 +41,6 @@ fun box(): String {
 // Array.kt:76 $kotlin.Array.set
 // String.kt:149 $kotlin.stringLiteral (11, 4)
 // test.kt:6 $box
-// Standard.kt:3 $box (16, 16, 16, 16)
 // String.kt:143 $kotlin.stringLiteral (15, 8, 15, 8)
 // test.kt:9 $box (11, 11, 11, 11, 4)
 // ExternalWrapper.kt:200 $kotlin.wasm.internal.kotlinToJsStringAdapter
diff --git a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt
index bcd4f444ce6..d219ec20c99 100644
--- a/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt
+++ b/compiler/testData/ir/sourceRanges/declarations/delegatedProperties.txt
@@ -11,7 +11,7 @@
             @6:25..8:5 FUN_EXPR type=kotlin.Function0<kotlin.Int> origin=LAMBDA
               @6:25..8:5 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Int
                 @7:8..9 BLOCK_BODY
-                  @7:8..9 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.MyClass.lazyProp$delegate'
+                  @7:9..9 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Int declared in <root>.MyClass.lazyProp$delegate'
                     @7:8..9 CONST Int type=kotlin.Int value=5
       @6:17..8:5 FUN DELEGATED_PROPERTY_ACCESSOR name:<get-lazyProp> visibility:public modality:FINAL <> ($this:<root>.MyClass) returnType:kotlin.Int
         @6:4..8:5 VALUE_PARAMETER name:<this> type:<root>.MyClass
diff --git a/compiler/testData/ir/sourceRanges/kt24258.txt b/compiler/testData/ir/sourceRanges/kt24258.txt
index b32884b8f67..a307f6e863d 100644
--- a/compiler/testData/ir/sourceRanges/kt24258.txt
+++ b/compiler/testData/ir/sourceRanges/kt24258.txt
@@ -6,7 +6,7 @@
           @3:35..53 FUN_EXPR type=kotlin.Function0<@[FlexibleNullability] kotlin.String?> origin=LAMBDA
             @3:35..53 FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:@[FlexibleNullability] kotlin.String?
               @3:37..51 BLOCK_BODY
-                @3:39..51 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): @[FlexibleNullability] kotlin.String? declared in <root>.lazyNullString$delegate'
+                @3:51..51 RETURN type=kotlin.Nothing from='local final fun <anonymous> (): @[FlexibleNullability] kotlin.String? declared in <root>.lazyNullString$delegate'
                   @3:39..51 CALL 'public open fun nullString (): @[FlexibleNullability] kotlin.String? declared in <root>.J' type=@[FlexibleNullability] kotlin.String? origin=null
     @3:27..53 FUN DELEGATED_PROPERTY_ACCESSOR name:<get-lazyNullString> visibility:public modality:FINAL <> () returnType:kotlin.String
       @3:30..53 BLOCK_BODY