azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Test] Fix source maps in testdata according to KT-37704

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-01-14 10:52:55 +03:00
parent a6600cef47
commit 6a2796b067
41 changed files with 69 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt
Vendored
+3 -5
View File
@@ -47,13 +47,12 @@ test/B
*L
1#1,19:1
13#2,2:20
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
9#1,2:20
9#1:20,2
*E
SMAP
@@ -68,11 +67,10 @@ test/A
*L
1#1,19:1
7#2,2:20
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt$box$1$1
*L
11#1,2:20
*E
11#1:20,2
*E
compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt
Vendored
+1 -2
View File
@@ -56,7 +56,6 @@ test/Introspector$SchemaRetriever
*L
1#1,21:1
8#2:22
*E
*S KotlinDebug
*F
+ 1 2.kt
@@ -77,4 +76,4 @@ IntrospectorImpl$SchemaRetriever
*L
1#1,12:1
9#2:13
*E
*E
compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
Vendored
-1
View File
@@ -56,7 +56,6 @@ builders/_1Kt
*L
1#1,21:1
7#2:22
*E
*S KotlinDebug
*F
+ 1 2.kt
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt
Vendored
+1 -2
View File
@@ -46,11 +46,10 @@ builders/_1Kt
*L
1#1,23:1
7#2:24
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
9#1:24
*E
*E
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt
Vendored
+2 -3
View File
@@ -53,14 +53,13 @@ builders/_1Kt
10#1,6:30
7#2:25
7#2:29
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
20#1,3:26
20#1,6:30
20#1:26,3
20#1:30,6
9#1:25
20#1:29
*E
compiler/testData/codegen/boxInline/smap/anonymous/object.kt
Vendored
+1 -2
View File
@@ -59,13 +59,12 @@ builders/_1Kt
*L
1#1,22:1
7#2,5:23
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
9#1,5:23
9#1:23,5
*E
SMAP
compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt
Vendored
+1 -2
View File
@@ -49,11 +49,10 @@ builders/_1Kt
*L
1#1,26:1
7#2:27
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
9#1:27
*E
*E
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
Vendored
+2 -3
View File
@@ -54,14 +54,13 @@ builders/_1Kt
10#1,8:32
7#2:27
7#2:31
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
22#1,3:28
22#1,8:32
22#1:28,3
22#1:32,8
9#1:27
22#1:31
*E
compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt
Vendored
+1 -3
View File
@@ -46,7 +46,6 @@ test/_1Kt
1#1,18:1
10#2:19
6#2:20
*E
*S KotlinDebug
*F
+ 1 2.kt
@@ -73,7 +72,6 @@ _2Kt
10#2:20
15#2:22
7#3:21
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -81,4 +79,4 @@ test/_1Kt$annotatedWith2$1
*L
6#1:19
6#1:22
*E
*E
compiler/testData/codegen/boxInline/smap/assertion.kt
Vendored
+3 -4
View File
@@ -53,12 +53,11 @@ test/_1Kt
1#1,14:1
18#2,7:15
9#2,7:22
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,7:15
7#1,7:22
*E
6#1:15,7
7#1:22,7
*E
compiler/testData/codegen/boxInline/smap/classCycle.kt
Vendored
-3
View File
@@ -30,7 +30,6 @@ test/A
1#1,14:1
11#1:16
6#2:15
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -55,7 +54,6 @@ test/B
10#2:15
11#2:17
11#2:18
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -85,7 +83,6 @@ test/B
6#2:9
10#3:8
11#3:10
*E
*S KotlinDebug
*F
+ 1 2.kt
compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt
Vendored
+1 -2
View File
@@ -26,11 +26,10 @@ A
*L
1#1,9:1
4#2:10
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
4#1:10
*E
*E
compiler/testData/codegen/boxInline/smap/crossroutines.kt
Vendored
+3 -4
View File
@@ -96,14 +96,13 @@ test/_1Kt
1#1,29:1
12#2,5:30
19#2,3:35
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt$box$1
*L
19#1,5:30
22#1,3:35
19#1:30,5
22#1:35,3
*E
SMAP
@@ -132,4 +131,4 @@ _2Kt$box$1
*L
1#1,23:1
20#2,2:24
*E
*E
compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt
Vendored
+1 -3
View File
@@ -29,7 +29,6 @@ test/_1Kt
*L
1#1,14:1
5#1:15
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -52,12 +51,11 @@ test/_1Kt
1#1,8:1
8#2,4:9
5#2:13
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,4:9
5#1:9,4
5#1:13
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
Vendored
+3 -7
View File
@@ -67,7 +67,6 @@ test/_1Kt
*L
1#1,39:1
30#2:40
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -118,13 +117,12 @@ test/_1Kt$lParams$1
1#1,8:1
32#2,5:9
33#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,5:9
5#1:9,5
5#1:14
*E
@@ -145,13 +143,12 @@ test/_1Kt$lParams$1
1#1,8:1
32#2,5:9
33#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,5:9
5#1:9,5
5#1:14
*E
@@ -167,7 +164,6 @@ test/_1Kt
*L
1#1,39:1
30#2:40
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -188,4 +184,4 @@ test/_1Kt$lParams$1$1
*L
1#1,39:1
33#2:40
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt
Vendored
+2 -4
View File
@@ -58,7 +58,6 @@ test/_1Kt
*L
1#1,39:1
30#2:40
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -85,13 +84,12 @@ test/_1Kt$lParams$1
32#2,5:11
30#2:17
33#3:16
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,5:11
6#1:11,5
6#1:17
6#1:16
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt
Vendored
+2 -4
View File
@@ -94,7 +94,6 @@ test/_1Kt
*L
1#1,75:1
30#2:76
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -122,14 +121,13 @@ test/_1Kt$lParams$1
71#2,2:12
30#2:15
51#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1:11
6#1,2:12
6#1:12,2
6#1:15
6#1:14
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
Vendored
+3 -6
View File
@@ -57,7 +57,6 @@ test/_1Kt
*L
1#1,40:1
31#2:41
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -109,13 +108,12 @@ test/_1Kt$lParams$1
33#2,5:9
31#2:15
34#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,5:9
5#1:9,5
5#1:15
5#1:14
*E
@@ -138,13 +136,12 @@ test/_1Kt$lParams$1
33#2,5:9
31#2:15
34#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,5:9
5#1:9,5
5#1:15
5#1:14
*E
@@ -161,4 +158,4 @@ test/_1Kt$lParams$1
*L
1#1,40:1
34#2:41
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
Vendored
+3 -6
View File
@@ -59,7 +59,6 @@ test/_1Kt
*L
1#1,40:1
31#2:41
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -111,13 +110,12 @@ test/_1Kt$lParams$1
33#2,5:11
31#2:17
34#3:16
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,5:11
6#1:11,5
6#1:17
6#1:16
*E
@@ -139,13 +137,12 @@ test/_1Kt$lParams$1
33#2,5:11
31#2:17
34#3:16
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,5:11
6#1:11,5
6#1:17
6#1:16
*E
@@ -162,4 +159,4 @@ test/_1Kt$lParams$1
*L
1#1,40:1
34#2:41
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt
Vendored
+2 -3
View File
@@ -73,12 +73,11 @@ test/_1Kt$lParams$1
1#1,10:1
31#2,5:11
32#3:16
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,5:11
6#1:11,5
6#1:16
*E
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
Vendored
+1 -2
View File
@@ -55,13 +55,12 @@ test/_1Kt
*L
1#1,9:1
7#2,2:10
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,2:10
6#1:10,2
*E
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt
Vendored
+1 -2
View File
@@ -45,12 +45,11 @@ test/_1Kt$inlineFun$1
1#1,9:1
7#2,2:10
7#3:12
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,2:10
6#1:10,2
6#1:12
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt
Vendored
+2 -3
View File
@@ -71,12 +71,11 @@ test/_1Kt$lParams$1
1#1,8:1
31#2,5:9
32#3:14
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1,5:9
5#1:9,5
5#1:14
*E
*E
compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt
Vendored
+1 -2
View File
@@ -30,11 +30,10 @@ test/_1Kt
*L
1#1,12:1
6#2:13
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1:13
*E
*E
compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt
Vendored
+1 -2
View File
@@ -30,11 +30,10 @@ test/_1Kt
*L
1#1,12:1
6#2:13
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1:13
*E
*E
compiler/testData/codegen/boxInline/smap/interleavedFiles.kt
Vendored
+1 -2
View File
@@ -40,7 +40,6 @@ test/_1Kt
4#2:18
4#2:20
4#2:22
*E
*S KotlinDebug
*F
+ 1 2.kt
@@ -49,7 +48,7 @@ _2Kt
8#1:19
13#1:21
13#1:23
13#1,7:24
13#1:24,7
7#1:18
9#1:20
13#1:22
compiler/testData/codegen/boxInline/smap/kt23369.kt
Vendored
+1 -2
View File
@@ -30,11 +30,10 @@ test/_1_aKt
*L
1#1,8:1
7#2:9
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1:9
*E
*E
compiler/testData/codegen/boxInline/smap/kt23369_2.kt
Vendored
+1 -2
View File
@@ -30,11 +30,10 @@ test/_1__aKt
*L
1#1,8:1
7#2:9
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1:9
*E
*E
compiler/testData/codegen/boxInline/smap/kt23369_3.kt
Vendored
+1 -2
View File
@@ -30,11 +30,10 @@ test/__aKt
*L
1#1,8:1
7#2:9
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
5#1:9
*E
*E
compiler/testData/codegen/boxInline/smap/kt35006.kt
Vendored
-1
View File
@@ -32,7 +32,6 @@ test/_1Kt
5#2:13
4#2:14
4#2:15
*E
*S KotlinDebug
*F
+ 1 2.kt
compiler/testData/codegen/boxInline/smap/multiFileFacade.kt
Vendored
+1 -3
View File
@@ -25,7 +25,6 @@ Facade___1Kt
*L
1#1,13:1
8#1:14
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -47,11 +46,10 @@ Facade___1Kt
*L
1#1,5:1
8#2:6
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
3#1:6
*E
*E
compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt
Vendored
+3 -4
View File
@@ -44,12 +44,11 @@ test/_1Kt
1#1,18:1
7#2,4:19
7#2,4:23
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
7#1,4:19
11#1,4:23
*E
7#1:19,4
11#1:23,4
*E
compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt
Vendored
+3 -6
View File
@@ -44,13 +44,12 @@ test/_1Kt
*L
1#1,19:1
7#2,3:20
*E
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$test$1
*L
14#1,3:20
14#1:20,3
*E
@@ -68,13 +67,12 @@ test/_1Kt
*L
1#1,16:1
12#2,6:17
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
8#1,6:17
8#1:17,6
*E
SMAP
@@ -93,12 +91,11 @@ _2Kt
7#2,2:20
9#2:24
9#3,2:22
*E
*S KotlinDebug
*F
+ 1 1.kt
test/_1Kt$test$1
*L
14#1,2:20
14#1:20,2
14#1:24
*E
compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt
Vendored
+3 -5
View File
@@ -50,13 +50,12 @@ test/_1Kt
*L
1#1,20:1
7#2,4:21
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
8#1,4:21
8#1:21,4
*E
SMAP
@@ -71,11 +70,10 @@ test/_1Kt
*L
1#1,20:1
13#2,3:21
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt$box$1$1
*L
10#1,3:21
*E
10#1:21,3
*E
compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt
Vendored
+3 -5
View File
@@ -50,13 +50,12 @@ test/_1Kt
*L
1#1,26:1
7#2,4:27
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
14#1,4:27
14#1:27,4
*E
SMAP
@@ -71,11 +70,10 @@ _2Kt
*L
1#1,26:1
6#2,3:27
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt$box$1$1
*L
16#1,3:27
*E
16#1:27,3
*E
compiler/testData/codegen/boxInline/smap/oneFile.kt
Vendored
+1 -2
View File
@@ -34,11 +34,10 @@ _2Kt
*L
1#1,15:1
10#1,3:16
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
4#1,3:16
4#1:16,3
*E
compiler/testData/codegen/boxInline/smap/rangeFolding.kt
Vendored
+1 -3
View File
@@ -40,7 +40,6 @@ test/_1Kt
4#1:15
6#1:16
5#1:17
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -65,12 +64,11 @@ test/_1Kt
1#1,17:1
9#2:18
4#2,9:19
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
13#1:18
13#1,9:19
13#1:19,9
*E
compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt
Vendored
-2
View File
@@ -48,7 +48,6 @@ test/B
4#2:17
6#3:18
5#4:19
*E
*S KotlinDebug
*F
+ 1 1.kt
@@ -84,7 +83,6 @@ test/B
4#3:19
6#4:21
5#5:23
*E
*S KotlinDebug
*F
+ 1 2.kt
compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt
Vendored
+2 -3
View File
@@ -34,11 +34,10 @@ zzz/_1Kt
*L
1#1,11:1
7#2,3:12
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
6#1,3:12
*E
6#1:12,3
*E
compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt
Vendored
-1
View File
@@ -35,7 +35,6 @@ zzz/_1Kt
*L
1#1,14:1
7#2:15
*E
*S KotlinDebug
*F
+ 1 2.kt
compiler/testData/codegen/boxInline/smap/smap.kt
Vendored
+7 -9
View File
@@ -56,14 +56,13 @@ builders/_1Kt
1#1,22:1
11#1,3:23
7#1,2:26
*E
*S KotlinDebug
*F
+ 1 1.kt
builders/_1Kt
*L
15#1,3:23
19#1,2:26
15#1:23,3
19#1:26,2
*E
// FILE: 2.smap
@@ -96,26 +95,25 @@ builders/_1Kt
11#2,2:40
13#2:44
8#2:46
*E
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
20#1,3:33
20#1:33,3
20#1:38
20#1,2:42
20#1:42,2
20#1:45
20#1:47
9#1:26
9#1:27
10#1:28
10#1,3:29
10#1:29,3
9#1:32
20#1:36
20#1:37
20#1:39
20#1,2:40
20#1:40,2
20#1:44
20#1:46
*E
*E