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

JVM: do not write trivial SMAPs to any classes

Browse Source 
Even ones inside inline functions. This was a backwards compatibility
hack for Kotlin 1.4, where the inliner would crash if it attempted to
regenerate an anonymous object with no SMAP; that has been fixed in 1.5,
and ever since then trivial SMAPs could be inferred from line number
markers in methods.

There are three kinds of changes to tests in this commit:

  * Some SMAPs are gone entirely - self-explanatory.

  * Some SMAPs have narrower line ranges - that's because the old SMAP
    had the range for the entire file, while the new one only maps up to
    the last line number used in the class. There should be no
    difference in behavior.

  * Some "source file name" markers are removed in continuation objects
    - continuations don't have any line numbers, so there's no debugging
    information anyway. The actual source information is in the
    containing class.
This commit is contained in:
Sonya Valchuk
2024-03-11 09:00:41 +00:00
committed by Space Cloud
parent fc992274bb
commit e5ad035039
43 changed files with 104 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxInline/contracts/crossinlineCallableReference.jvm_abi.txt
Vendored
+10 -10
View File
@@ -70,16 +70,16 @@ MODULE main
+ 3 1.kt
test/_1Kt
*L
1#1,32:1
17#2:33
18#2:36
29#3,2:34
1#1,25:1
17#2:26
18#2:29
29#3,2:27
*S KotlinDebug
*F
+ 1 1.kt
test/OutputWorkScreenView
*L
17#1:34,2
17#1:27,2
*E
} )
K2
@@ -95,15 +95,15 @@ MODULE main
+ 3 1.kt
test/_1Kt
*L
1#1,32:1
17#2:33
18#2:36
29#3,2:34
1#1,25:1
17#2:26
18#2:29
29#3,2:27
*S KotlinDebug
*F
+ 1 1.kt
test/OutputWorkScreenView
*L
17#1:34,2
17#1:27,2
*E
} )
compiler/testData/codegen/boxInline/contracts/exactlyOnceCrossinline2.jvm_abi.txt
Vendored
+10 -10
View File
@@ -92,8 +92,8 @@ MODULE main
+ 2 1.kt
test/A
*L
1#1,33:1
20#2,2:34
1#1,30:1
20#2,2:31
*E
} )
K2
@@ -107,8 +107,8 @@ MODULE main
+ 2 1.kt
test/A
*L
1#1,33:1
20#2,2:34
1#1,30:1
20#2,2:31
*E
} )
CLASS test/A$foo$$inlined$bar$1.class
@@ -124,9 +124,9 @@ MODULE main
+ 2 1.kt
test/A
*L
1#1,33:1
20#2:34
14#2,8:35
1#1,30:1
20#2:31
14#2,8:32
*E
} )
K2
@@ -140,8 +140,8 @@ MODULE main
+ 2 1.kt
test/A
*L
1#1,33:1
20#2:34
14#2,8:35
1#1,30:1
20#2:31
14#2,8:32
*E
} )
compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap
Vendored
+2 -12
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/Introspector$SchemaRetriever$inSchema$lambda$1
*L
1#1,14:1
*E
// FILE: 2.kt
SMAP
@@ -41,7 +31,7 @@ test/Introspector$SchemaRetriever$inSchema$lambda$1
+ 2 2.kt
IntrospectorImpl$SchemaRetriever
*L
1#1,14:1
22#2:15
1#1,10:1
22#2:11
*E
compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
// NO_CHECK_LAMBDA_INLINING
// IGNORE_INLINER_K2: IR
// IGNORE_INLINER: IR
// FILE: 1.kt
package builders
compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap
Vendored
+2 -12
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
builders/_1Kt$call$lambda$1
*L
1#1,13:1
*E
// FILE: 2.kt
SMAP
@@ -41,7 +31,7 @@ builders/_1Kt$call$lambda$1
+ 2 2.kt
_2Kt
*L
1#1,13:1
21#2,2:14
1#1,10:1
21#2,2:11
*E
compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap
Vendored
-22
View File
@@ -27,25 +27,3 @@ _2Kt
30#1:37
*E
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt$test$1$1
*L
1#1,32:1
*E
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt$test$1$1
*L
1#1,32:1
*E
compiler/testData/codegen/boxInline/smap/anonymous/object.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// NO_CHECK_LAMBDA_INLINING
// IGNORE_INLINER: IR
// FILE: 1.kt
package builders
inline fun call(crossinline init: () -> Unit) {
compiler/testData/codegen/boxInline/smap/anonymous/object.smap
Vendored
+2 -12
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
builders/_1Kt$call$1
*L
1#1,15:1
*E
// FILE: 2.kt
SMAP
@@ -41,7 +31,7 @@ builders/_1Kt$call$1
+ 2 2.kt
_2Kt
*L
1#1,15:1
24#2,2:16
1#1,11:1
24#2,2:12
*E
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt
Vendored
+1 -3
View File
@@ -1,8 +1,6 @@
// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
// IGNORE_BACKEND: JVM_IR
// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
// NO_CHECK_LAMBDA_INLINING
// FILE: 1.kt
package builders
inline fun call(crossinline init: () -> Unit) {
return init()
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap
Vendored
+9 -31
View File
@@ -11,41 +11,19 @@ _2Kt
+ 2 1.kt
builders/_1Kt
*L
1#1,34:1
17#1,3:36
20#1,8:40
8#2:35
8#2:39
1#1,32:1
15#1,3:34
18#1,8:38
6#2:33
6#2:37
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
32#1:36,3
32#1:40,8
19#1:35
32#1:39
*E
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt$test$1$1
*L
1#1,34:1
*E
SMAP
2.kt
Kotlin
*S Kotlin
*F
+ 1 2.kt
_2Kt$test$1$1
*L
1#1,34:1
30#1:34,3
30#1:38,8
17#1:33
30#1:37
*E
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt
Vendored
+1 -2
View File
@@ -1,10 +1,9 @@
// IGNORE
// NO_CHECK_LAMBDA_INLINING
// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD
// IGNORE_BACKEND_K2_MULTI_MODULE: JVM_IR JVM_IR_SERIALIZE
// FILE: 1.kt
// NO_SMAP_DUMP
package builders
inline fun call(crossinline init: () -> Unit) {
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap
Vendored
+5 -5
View File
@@ -9,15 +9,15 @@ _2Kt
+ 2 1.kt
builders/_1Kt
*L
1#1,36:1
15#2,3:37
11#2,15:40
1#1,35:1
14#2,3:36
10#2,15:39
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
34#1:37,3
34#1:40,15
33#1:36,3
33#1:39,15
*E
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt
Vendored
+3 -1
View File
@@ -1,7 +1,9 @@
// NO_CHECK_LAMBDA_INLINING
// IGNORE_BACKEND: JVM
// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_MULTI_MODULE_IR_AGAINST_OLD
// IGNORE_INLINER: IR
// FILE: 1.kt
// NO_SMAP_DUMP
package builders
//TODO there is a bug in asm it's skips linenumber on same line on reading bytecode
inline fun call(crossinline init: () -> Unit) {
compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap
Vendored
+7 -7
View File
@@ -9,16 +9,16 @@ _2Kt
+ 2 1.kt
builders/_1Kt
*L
1#1,34:1
12#2,3:35
8#2,15:38
1#1,36:1
14#2,3:37
10#2,15:40
*S KotlinDebug
*F
+ 1 2.kt
_2Kt
*L
31#1:35,3
31#1:38,15
33#1:37,3
33#1:40,15
*E
SMAP
@@ -31,7 +31,7 @@ builders/_1Kt$test$1$1
+ 2 2.kt
_2Kt
*L
1#1,25:1
31#2:26
1#1,20:1
33#2:21
*E
compiler/testData/codegen/boxInline/smap/crossroutines.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// This test depends on line numbers
// IGNORE_INLINER: IR
// WITH_STDLIB
// FILE: 1.kt
package test
compiler/testData/codegen/boxInline/smap/crossroutines.smap
Vendored
+4 -36
View File
@@ -1,36 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineMe2$2
*L
1#1,23:1
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineMe1$2
*L
1#1,23:1
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineMe1$2$run$1
*L
1#1,23:1
*E
// FILE: 2.kt
SMAP
@@ -65,8 +33,8 @@ test/_1Kt$inlineMe2$2
+ 2 2.kt
_2Kt$box$1
*L
1#1,23:1
45#2,2:24
1#1,21:1
45#2,2:22
*E
SMAP
@@ -79,7 +47,7 @@ test/_1Kt$inlineMe1$2
+ 2 2.kt
_2Kt$box$1
*L
1#1,23:1
42#2,2:24
1#1,15:1
42#2,2:16
*E
compiler/testData/codegen/boxInline/smap/defaultFunction.smap
Vendored
-10
View File
@@ -1,12 +1,2 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$1
*L
1#1,10:1
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IGNORE_INLINER_K2: IR
// IGNORE_INLINER: IR
// SEPARATE_SMAP_DUMPS
// SKIP_INLINE_CHECK_IN: lParams$default
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation
Vendored
+2 -24
View File
@@ -1,15 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
*E
SMAP
1.kt
Kotlin
@@ -40,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$lambda$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation
Vendored
+4 -26
View File
@@ -1,15 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
*E
SMAP
1.kt
Kotlin
@@ -40,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$lambda$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
@@ -110,7 +88,7 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1$lambda$1
*L
1#1,41:1
35#2:42
1#1,32:1
35#2:33
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// SEPARATE_SMAP_DUMPS
// SKIP_INLINE_CHECK_IN: lParams$default
// IGNORE_BACKEND: JS
// IGNORE_INLINER_K2: IR
// IGNORE_INLINER: IR
// FILE: 1.kt
package test
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation
Vendored
+2 -13
View File
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation
Vendored
+4 -15
View File
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
@@ -81,7 +70,7 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
1#1,32:1
35#2:33
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
// SEPARATE_SMAP_DUMPS
// SKIP_INLINE_CHECK_IN: lParams$default
// IGNORE_BACKEND: JS
// IGNORE_INLINER_K2: IR
// IGNORE_INLINER: IR
// FILE: 1.kt
package test
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation
Vendored
+2 -13
View File
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation
Vendored
+4 -15
View File
@@ -29,19 +29,8 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$kValue$lambda$1
*L
1#1,41:1
1#1,32:1
35#2:33
*E
// FILE: 2.kt
@@ -81,7 +70,7 @@ test/_1Kt$kValue$lambda$1
+ 2 1.kt
test/_1Kt$lParams$1
*L
1#1,41:1
35#2:42
1#1,32:1
35#2:33
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap
Vendored
-10
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1
*L
1#1,38:1
*E
// FILE: 2.kt
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
// IGNORE_INLINER_K2: IR
// IGNORE_INLINER: IR
// SKIP_INLINE_CHECK_IN: inlineFun$default
// FILE: 1.kt
compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap
Vendored
+2 -23
View File
@@ -1,25 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$lambda2$1
*L
1#1,13:1
*E
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$1
*L
1#1,13:1
*E
// FILE: 2.kt
SMAP
@@ -52,7 +31,7 @@ test/_1Kt$inlineFun$lambda2$1
+ 2 1.kt
test/_1Kt$inlineFun$1
*L
1#1,13:1
7#2:14
1#1,9:1
7#2:10
*E
compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap
Vendored
-10
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$inlineFun$1
*L
1#1,11:1
*E
// FILE: 2.kt
SMAP
compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap
Vendored
-10
View File
@@ -1,14 +1,4 @@
// FILE: 1.kt
SMAP
1.kt
Kotlin
*S Kotlin
*F
+ 1 1.kt
test/_1Kt$lParams$1
*L
1#1,38:1
*E
// FILE: 2.kt
SMAP
compiler/testData/codegen/boxInline/suspend/stateMachine/innerObjectRetransformation.jvm_abi.txt
Vendored
+4 -4
View File
@@ -12,8 +12,8 @@ MODULE main
+ 2 box.kt
BoxKt
*L
1#1,48:1
66#2:49
1#1,38:1
66#2:39
*E
} )
K2
@@ -27,7 +27,7 @@ MODULE main
+ 2 box.kt
BoxKt
*L
1#1,48:1
67#2:49
1#1,38:1
67#2:39
*E
} )