diff --git a/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt index 44017420879..fb13f42a35a 100644 --- a/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt +++ b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.kt @@ -33,45 +33,3 @@ fun box(): String { return z; } -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/B -*L -1#1,19:1 -13#2,2:20 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -9#1:20,2 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$box$1$1 -+ 2 1.kt -test/A -*L -1#1,19:1 -7#2,2:20 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt$box$1$1 -*L -11#1:20,2 -*E diff --git a/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.smap b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.smap new file mode 100644 index 00000000000..61545021938 --- /dev/null +++ b/compiler/testData/codegen/boxInline/anonymousObject/inlineCallInsideInlineLambda.smap @@ -0,0 +1,43 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/B +*L +1#1,36:1 +15#2,2:37 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +26#1:37,2 +*E + +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt$box$1$1 ++ 2 1.kt +test/A +*L +1#1,36:1 +9#2,2:37 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1$1 +*L +28#1:37,2 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt index e43e2f41ebc..5a673bf38c3 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.kt @@ -27,53 +27,3 @@ fun box(): String { return result } - - -// SMAP_FILE: 1.smap - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/Introspector$SchemaRetriever$inSchema$1 -*L -1#1,12:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -IntrospectorImpl$SchemaRetriever -+ 2 1.kt -test/Introspector$SchemaRetriever -*L -1#1,21:1 -8#2:22 -*S KotlinDebug -*F -+ 1 2.kt -IntrospectorImpl$SchemaRetriever -*L -9#1:22 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/Introspector$SchemaRetriever$inSchema$1 -+ 2 2.kt -IntrospectorImpl$SchemaRetriever -*L -1#1,12:1 -9#2:13 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap new file mode 100644 index 00000000000..cac2acf0a38 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/kt19175.smap @@ -0,0 +1,47 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/Introspector$SchemaRetriever$inSchema$1 +*L +1#1,12:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +IntrospectorImpl$SchemaRetriever ++ 2 1.kt +test/Introspector$SchemaRetriever +*L +1#1,30:1 +8#2:31 +*S KotlinDebug +*F ++ 1 2.kt +IntrospectorImpl$SchemaRetriever +*L +20#1:31 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/Introspector$SchemaRetriever$inSchema$1 ++ 2 2.kt +IntrospectorImpl$SchemaRetriever +*L +1#1,12:1 +20#2:13 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt index bb0652c21ae..9a35ec2e9dc 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt @@ -28,52 +28,3 @@ fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -builders/_1Kt$call$1 -*L -1#1,12:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,21:1 -7#2:22 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -9#1:22 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -builders/_1Kt$call$1 -+ 2 2.kt -_2Kt -*L -1#1,12:1 -10#2,2:13 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap new file mode 100644 index 00000000000..133f8d6dee6 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.smap @@ -0,0 +1,47 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +builders/_1Kt$call$1 +*L +1#1,13:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,31:1 +8#2:32 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +20#1:32 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +builders/_1Kt$call$1 ++ 2 2.kt +_2Kt +*L +1#1,13:1 +21#2,2:14 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt index 72f27645570..20b1a1be810 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt @@ -29,27 +29,3 @@ fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,23:1 -7#2:24 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -9#1:24 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.smap new file mode 100644 index 00000000000..e5c475cd021 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,32:1 +8#2:33 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +19#1:33 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt index fe2371a5e96..78e960f23ba 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt @@ -1,4 +1,7 @@ +// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD // NO_CHECK_LAMBDA_INLINING +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // FILE: 1.kt package builders inline fun call(crossinline init: () -> Unit) { @@ -26,59 +29,3 @@ inline fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -//TODO -//7#1,3:26 -//10#1,6:30 - could be merged in one big interval due preprocessing of inline function - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,24:1 -7#1,3:26 -10#1,6:30 -7#2:25 -7#2:29 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -20#1:26,3 -20#1:30,6 -9#1:25 -20#1:29 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$test$1$1 -*L -1#1,24:1 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$test$1$1 -*L -1#1,24:1 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap new file mode 100644 index 00000000000..cb3869e00a4 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.smap @@ -0,0 +1,51 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,32:1 +17#1,3:34 +20#1,6:38 +8#2:33 +8#2:37 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +30#1:34,3 +30#1:38,6 +19#1:33 +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 + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt index 10891d59f68..ae92844e2de 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt @@ -31,52 +31,3 @@ fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -builders/_1Kt$call$1 -*L -1#1,14:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,22:1 -7#2,5:23 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -9#1:23,5 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -builders/_1Kt$call$1 -+ 2 2.kt -_2Kt -*L -1#1,14:1 -10#2,2:15 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.smap b/compiler/testData/codegen/boxInline/smap/anonymous/object.smap new file mode 100644 index 00000000000..5b38bce24d9 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.smap @@ -0,0 +1,47 @@ +// 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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,34:1 +8#2,5:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +23#1:35,5 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +builders/_1Kt$call$1 ++ 2 2.kt +_2Kt +*L +1#1,15:1 +24#2,2:16 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt index 5fa90ffa9b8..80a01496734 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt @@ -31,28 +31,3 @@ fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -//SMAP -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,26:1 -7#2:27 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -9#1:27 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.smap new file mode 100644 index 00000000000..190a3327f86 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,34:1 +8#2:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +19#1:35 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt index 94f3a7a06a4..a895e30838a 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt @@ -1,3 +1,6 @@ +// IGNORE_BACKEND_MULTI_MODULE: JVM_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD +// IGNORE_BACKEND: JVM_IR +// IGNORE_BACKEND_FIR: JVM_IR // NO_CHECK_LAMBDA_INLINING // FILE: 1.kt package builders @@ -28,58 +31,3 @@ inline fun test(): String { fun box(): String { return test() } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -//7#1,3:28 -//10#1,8:32 - could be merged in one big interval due preprocessing of inline function - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,26:1 -7#1,3:28 -10#1,8:32 -7#2:27 -7#2:31 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -22#1:28,3 -22#1:32,8 -9#1:27 -22#1:31 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$test$1$1 -*L -1#1,26:1 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$test$1$1 -*L -1#1,26:1 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap new file mode 100644 index 00000000000..d123ab534ff --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.smap @@ -0,0 +1,51 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_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 +*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 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt index 1b34a3ff4ca..840b21c7cdb 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.kt @@ -1,5 +1,8 @@ +// IGNORE // NO_CHECK_LAMBDA_INLINING +// IGNORE_BACKEND_MULTI_MODULE: JVM, JVM_IR, JVM_MULTI_MODULE_OLD_AGAINST_IR, JVM_MULTI_MODULE_IR_AGAINST_OLD // FILE: 1.kt +// NO_SMAP_DUMP package builders @@ -29,56 +32,3 @@ import builders.* fun box(): String { return test() } - -// SMAP_FILE: 1.sxmap - -//TODO SHOULD BE LESS - -SXMAP -objectOnInlineCallSite2.2.kt -Kotlin -*S Kotlin -*F -+ 1 objectOnInlineCallSite2.2.kt -builders/BuildersPackage -*L -1#1,42:1 -*E - -SXMAP -objectOnInlineCallSite2.2.kt -Kotlin -*S Kotlin -*F -+ 1 objectOnInlineCallSite2.2.kt -builders/BuildersPackage$objectOnInlineCallSite2_2$HASH$test$1$1 -*L -1#1,42:1 -*E - -// SMAP_FILE: 2.sxmap - -SXMAP -objectOnInlineCallSite2.1.kt -Kotlin -*S Kotlin -*F -+ 1 objectOnInlineCallSite2.1.kt -_DefaultPackage -+ 2 objectOnInlineCallSite2.2.kt -builders/BuildersPackage -*L -1#1,32:1 -8#2,11:33 -*E - -SXMAP -objectOnInlineCallSite2.2.kt -Kotlin -*S Kotlin -*F -+ 1 objectOnInlineCallSite2.2.kt -builders/BuildersPackage$objectOnInlineCallSite2_2$HASH$test$1$1 -*L -1#1,42:1 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap new file mode 100644 index 00000000000..b47ee8e448e --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite2.smap @@ -0,0 +1,23 @@ +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,35:1 +14#2,3:36 +10#2,15:39 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +33#1:36,3 +33#1:39,15 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt index a1d56a3a7b2..294ce31ba4c 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.kt @@ -1,6 +1,6 @@ // NO_CHECK_LAMBDA_INLINING // 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 @@ -21,7 +21,6 @@ inline fun test(crossinline p: () -> String): String { return res } -//TODO SHOULD BE LESS // FILE: 2.kt @@ -32,4 +31,3 @@ fun box(): String { return test{"OK"} } -//TODO diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap new file mode 100644 index 00000000000..41e420e11ae --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSiteWithCapture.smap @@ -0,0 +1,37 @@ +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,34:1 +12#2,3:35 +8#2,15:38 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +31#1:35,3 +31#1:38,15 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +builders/_1Kt$test$1$1 ++ 2 2.kt +_2Kt +*L +1#1,25:1 +31#2:26 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt index 4bc97904ec2..e3050bde68d 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt @@ -1,4 +1,5 @@ -//FILE: 1.kt +// FILE: 1.kt +// NO_SMAP_DUMP package test @@ -15,7 +16,7 @@ inline fun any(s: () -> Boolean) { } -//FILE: 2.kt +// FILE: 2.kt import test.* fun box(): String { @@ -31,52 +32,3 @@ inline fun test(z: () -> Unit) { z() } - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,18:1 -10#2:19 -6#2:20 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -7#1:19 -7#1:20 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$annotatedWith2$1 -+ 2 1.kt -test/_1Kt -+ 3 2.kt -_2Kt -*L -1#1,18:1 -14#2:19 -10#2:20 -15#2:22 -7#3:21 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$annotatedWith2$1 -*L -6#1:19 -6#1:22 -*E diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.smap b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.smap new file mode 100644 index 00000000000..6838dd6dbc8 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.smap @@ -0,0 +1,49 @@ +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,35:1 +11#2:36 +7#2:37 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +25#1:36 +25#1:37 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$annotatedWith2$1 ++ 2 1.kt +test/_1Kt ++ 3 2.kt +_2Kt +*L +1#1,19:1 +15#2:20 +11#2:21 +16#2:23 +25#3:22 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$annotatedWith2$1 +*L +7#1:20 +7#1:23 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/assertion.kt b/compiler/testData/codegen/boxInline/smap/assertion.kt index eef59ca5d0c..0336a2c853f 100644 --- a/compiler/testData/codegen/boxInline/smap/assertion.kt +++ b/compiler/testData/codegen/boxInline/smap/assertion.kt @@ -35,29 +35,3 @@ fun box(): String { return "OK" } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,14:1 -18#2,7:15 -9#2,7:22 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:15,7 -7#1:22,7 -*E diff --git a/compiler/testData/codegen/boxInline/smap/assertion.smap b/compiler/testData/codegen/boxInline/smap/assertion.smap new file mode 100644 index 00000000000..387c0ab04ea --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/assertion.smap @@ -0,0 +1,25 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,38:1 +18#2,7:39 +9#2,7:46 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +31#1:39,7 +32#1:46,7 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/classCycle.kt b/compiler/testData/codegen/boxInline/smap/classCycle.kt index ad3273a254b..c1b9e2f7564 100644 --- a/compiler/testData/codegen/boxInline/smap/classCycle.kt +++ b/compiler/testData/codegen/boxInline/smap/classCycle.kt @@ -15,81 +15,3 @@ class B { import test.* fun box() = A().a() - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/B -+ 2 1.kt -test/A -*L -1#1,14:1 -11#1:16 -6#2:15 -*S KotlinDebug -*F -+ 1 1.kt -test/B -*L -10#1:16 -10#1:15 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/A -+ 2 1.kt -test/B -*L -1#1,14:1 -6#1:16 -10#2:15 -11#2:17 -11#2:18 -*S KotlinDebug -*F -+ 1 1.kt -test/A -*L -5#1:16 -5#1:15 -5#1:17 -6#1:18 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/A -+ 3 1.kt -test/B -*L -1#1,6:1 -5#2:7 -6#2:9 -10#3:8 -11#3:10 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -4#1:7 -4#1:9 -4#1:8 -4#1:10 -*E diff --git a/compiler/testData/codegen/boxInline/smap/classCycle.smap b/compiler/testData/codegen/boxInline/smap/classCycle.smap new file mode 100644 index 00000000000..d823e997e6f --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/classCycle.smap @@ -0,0 +1,78 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/B ++ 2 1.kt +test/A +*L +1#1,14:1 +11#1:16 +6#2:15 +*S KotlinDebug +*F ++ 1 1.kt +test/B +*L +10#1:16 +10#1:15 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/A ++ 2 1.kt +test/B +*L +1#1,14:1 +6#1:16 +10#2:15 +11#2:17 +11#2:18 +*S KotlinDebug +*F ++ 1 1.kt +test/A +*L +5#1:16 +5#1:15 +5#1:17 +6#1:18 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/A ++ 3 1.kt +test/B +*L +1#1,18:1 +5#2:19 +6#2:21 +10#3:20 +11#3:22 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +17#1:19 +17#1:21 +17#1:20 +17#1:22 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt index ce18ad6eb4f..8ae59ef3043 100644 --- a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt +++ b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt @@ -11,25 +11,3 @@ fun box(): String { return "OK" } - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -A -*L -1#1,9:1 -4#2:10 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -4#1:10 -*E diff --git a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.smap b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.smap new file mode 100644 index 00000000000..1edb2509174 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +A +*L +1#1,14:1 +4#2:15 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +10#1:15 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/crossroutines.kt b/compiler/testData/codegen/boxInline/smap/crossroutines.kt index 2e1712e4705..24080f49f5d 100644 --- a/compiler/testData/codegen/boxInline/smap/crossroutines.kt +++ b/compiler/testData/codegen/boxInline/smap/crossroutines.kt @@ -1,5 +1,6 @@ // This test depends on line numbers // WITH_RUNTIME +// IGNORE_BACKEND_FIR: JVM_IR // FILE: 1.kt package test @@ -47,87 +48,3 @@ fun box(): String { return res } -// SMAP_FILE: 1.smap -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 - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$box$1 -+ 2 1.kt -test/_1Kt -*L -1#1,29:1 -12#2,5:30 -19#2,3:35 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt$box$1 -*L -19#1:30,5 -22#1:35,3 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineMe2$2 -+ 2 2.kt -_2Kt$box$1 -*L -1#1,23:1 -23#2,2:24 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineMe1$2 -+ 2 2.kt -_2Kt$box$1 -*L -1#1,23:1 -20#2,2:24 -*E diff --git a/compiler/testData/codegen/boxInline/smap/crossroutines.smap b/compiler/testData/codegen/boxInline/smap/crossroutines.smap new file mode 100644 index 00000000000..dcc6a864d97 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/crossroutines.smap @@ -0,0 +1,85 @@ +// 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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt$box$1 ++ 2 1.kt +test/_1Kt +*L +1#1,51:1 +12#2,5:52 +19#2,3:57 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1 +*L +41#1:52,5 +44#1:57,3 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$inlineMe2$2 ++ 2 2.kt +_2Kt$box$1 +*L +1#1,23:1 +45#2,2:24 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$inlineMe1$2 ++ 2 2.kt +_2Kt$box$1 +*L +1#1,23:1 +42#2,2:24 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunction.kt b/compiler/testData/codegen/boxInline/smap/defaultFunction.kt index 0442bd85f17..99527ea8e88 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultFunction.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultFunction.kt @@ -8,22 +8,10 @@ inline fun inlineFun(capturedParam: String, noinline lambda: () -> String = { ca } // FILE: 2.kt +// NO_SMAP_DUMP import test.* fun box(): String { return inlineFun("OK") } -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineFun$1 -*L -1#1,9:1 -*E - -// SMAP_FILE: 2.TODO diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunction.smap b/compiler/testData/codegen/boxInline/smap/defaultFunction.smap new file mode 100644 index 00000000000..381bfe1c877 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultFunction.smap @@ -0,0 +1,12 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$inlineFun$1 +*L +1#1,10:1 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt index b9506f5c2f8..bbcef2f7295 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.kt @@ -18,44 +18,3 @@ fun box(): String { return inlineFun() } -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt -*L -1#1,14:1 -5#1:15 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt -*L -11#1:15 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,8:1 -8#2,4:9 -5#2:13 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,4 -5#1:13 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.smap b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.smap new file mode 100644 index 00000000000..621f609502b --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultFunctionWithInlineCall.smap @@ -0,0 +1,42 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt +*L +1#1,14:1 +5#1:15 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt +*L +11#1:15 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,21:1 +8#2,4:22 +5#2:26 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +18#1:22,4 +18#1:26 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt index 7ab39ebe795..635ffe33422 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.kt @@ -1,3 +1,4 @@ +// SEPARATE_SMAP_DUMPS // SKIP_INLINE_CHECK_IN: lParams$default // FILE: 1.kt @@ -42,146 +43,3 @@ import test.* fun box(): String { return lParams() } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -1#1,39:1 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1$1 -+ 2 1.kt -test/_1Kt -*L -1#1,39:1 -30#2:40 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1$1 -*L -33#1:40 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1$1 -*L -1#1,39:1 -33#2:40 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -*L -1#1,39:1 -*E - -// SMAP_FILE: 2.smap-nonseparate-compilation - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,8:1 -32#2,5:9 -33#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,5 -5#1:14 -*E - -// SMAP_FILE: 2.smap-separate-compilation - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,8:1 -32#2,5:9 -33#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,5 -5#1:14 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1$1 -+ 2 1.kt -test/_1Kt -*L -1#1,39:1 -30#2:40 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1$1 -*L -33#1:40 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1$1 -*L -1#1,39:1 -33#2:40 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation new file mode 100644 index 00000000000..aedfd40148c --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-nonseparate-compilation @@ -0,0 +1,82 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +1#1,40:1 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 ++ 2 1.kt +test/_1Kt +*L +1#1,40:1 +31#2:41 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 +*L +34#1:41 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 ++ 2 1.kt +test/_1Kt$lParams$1$1 +*L +1#1,40:1 +34#2:41 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 +*L +1#1,40:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,46:1 +33#2,5:47 +34#3:52 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +44#1:47,5 +44#1:52 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation new file mode 100644 index 00000000000..1cb7c6ea776 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/defaultLambdaInAnonymous.smap-separate-compilation @@ -0,0 +1,116 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +1#1,40:1 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 ++ 2 1.kt +test/_1Kt +*L +1#1,40:1 +31#2:41 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 +*L +34#1:41 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 ++ 2 1.kt +test/_1Kt$lParams$1$1 +*L +1#1,40:1 +34#2:41 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 +*L +1#1,40:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,46:1 +33#2,5:47 +34#3:52 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +44#1:47,5 +44#1:52 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 ++ 2 1.kt +test/_1Kt +*L +1#1,40:1 +31#2:41 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1$1 +*L +34#1:41 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 ++ 2 1.kt +test/_1Kt$lParams$1$1 +*L +1#1,40:1 +34#2:41 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt index 2b1213bbea0..7c33590e546 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.kt @@ -44,52 +44,3 @@ fun box(): String { lParams() } } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -+ 2 1.kt -test/_1Kt -*L -1#1,39:1 -30#2:40 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -33#1:40 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,10:1 -32#2,5:11 -30#2:17 -33#3:16 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:11,5 -6#1:17 -6#1:16 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.smap new file mode 100644 index 00000000000..ada13ad7614 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault.smap @@ -0,0 +1,48 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,39:1 +30#2:40 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +33#1:40 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,47:1 +32#2,5:48 +30#2:54 +33#3:53 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +44#1:48,5 +44#1:54 +44#1:53 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt index 8170f75d447..3419026722b 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.kt @@ -80,54 +80,3 @@ fun box(): String { lParams() } } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -+ 2 1.kt -test/_1Kt -*L -1#1,75:1 -30#2:76 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -51#1:76 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,10:1 -32#2:11 -71#2,2:12 -30#2:15 -51#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:11 -6#1:12,2 -6#1:15 -6#1:14 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.smap new file mode 100644 index 00000000000..75af98ee40a --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlinInDefault2.smap @@ -0,0 +1,50 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,75:1 +30#2:76 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +51#1:76 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,83:1 +32#2:84 +71#2,2:85 +30#2:88 +51#3:87 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +80#1:84 +80#1:85,2 +80#1:88 +80#1:87 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt index 3ab4cc99c80..496d4812b0f 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.kt @@ -1,3 +1,4 @@ +// SEPARATE_SMAP_DUMPS // SKIP_INLINE_CHECK_IN: lParams$default // IGNORE_BACKEND: JS @@ -43,119 +44,3 @@ import test.* fun box(): String { return lParams() } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -+ 2 1.kt -test/_1Kt -*L -1#1,40:1 -31#2:41 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -34#1:41 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1 -*L -1#1,40:1 -34#2:41 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -*L -1#1,40:1 -*E - -// SMAP_FILE: 2.smap-nonseparate-compilation - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,8:1 -33#2,5:9 -31#2:15 -34#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,5 -5#1:15 -5#1:14 -*E - -// SMAP_FILE: 2.smap-separate-compilation - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,8:1 -33#2,5:9 -31#2:15 -34#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,5 -5#1:15 -5#1:14 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1 -*L -1#1,40:1 -34#2:41 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation new file mode 100644 index 00000000000..0fad28d53a7 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-nonseparate-compilation @@ -0,0 +1,73 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,41:1 +32#2:42 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +35#1:42 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$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$1 +*L +1#1,41:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,47:1 +34#2,5:48 +32#2:54 +35#3:53 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +45#1:48,5 +45#1:54 +45#1:53 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation new file mode 100644 index 00000000000..de4af09ebf8 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault.smap-separate-compilation @@ -0,0 +1,87 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,41:1 +32#2:42 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +35#1:42 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$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$1 +*L +1#1,41:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,47:1 +34#2,5:48 +32#2:54 +35#3:53 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +45#1:48,5 +45#1:54 +45#1:53 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 ++ 2 1.kt +test/_1Kt$lParams$1 +*L +1#1,41:1 +35#2:42 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt index 85001ad2e9e..54ad48f24e1 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.kt @@ -1,3 +1,4 @@ +// SEPARATE_SMAP_DUMPS // SKIP_INLINE_CHECK_IN: lParams$default // IGNORE_BACKEND: JS @@ -45,118 +46,3 @@ fun box(): String { lParams() } } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -+ 2 1.kt -test/_1Kt -*L -1#1,40:1 -31#2:41 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -34#1:41 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1 -*L -1#1,40:1 -34#2:41 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -*L -1#1,40:1 -*E - -// SMAP_FILE: 2.smap-nonseparate-compilation - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,10:1 -33#2,5:11 -31#2:17 -34#3:16 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:11,5 -6#1:17 -6#1:16 -*E - -// SMAP_FILE: 2.smap-separate-compilation -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,10:1 -33#2,5:11 -31#2:17 -34#3:16 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:11,5 -6#1:17 -6#1:16 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$kValue$1 -+ 2 1.kt -test/_1Kt$lParams$1 -*L -1#1,40:1 -34#2:41 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation new file mode 100644 index 00000000000..4cf0e7993a8 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-nonseparate-compilation @@ -0,0 +1,73 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,41:1 +32#2:42 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +35#1:42 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$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$1 +*L +1#1,41:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,49:1 +34#2,5:50 +32#2:56 +35#3:55 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +46#1:50,5 +46#1:56 +46#1:55 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation new file mode 100644 index 00000000000..4cac326cfa2 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/inlineAnonymousInDefault2.smap-separate-compilation @@ -0,0 +1,87 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$lParams$1 ++ 2 1.kt +test/_1Kt +*L +1#1,41:1 +32#2:42 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$lParams$1 +*L +35#1:42 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$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$1 +*L +1#1,41:1 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,49:1 +34#2,5:50 +32#2:56 +35#3:55 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +46#1:50,5 +46#1:56 +46#1:55 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$kValue$1 ++ 2 1.kt +test/_1Kt$lParams$1 +*L +1#1,41:1 +35#2:42 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt index 67d376e9c49..968cb053ee1 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.kt @@ -43,41 +43,3 @@ fun box(): String { lParams() } } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -1#1,38:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,10:1 -31#2,5:11 -32#3:16 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:11,5 -6#1:16 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap new file mode 100644 index 00000000000..dc5b3ef1fde --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/kt21827.smap @@ -0,0 +1,37 @@ +// 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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,46:1 +31#2,5:47 +32#3:52 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +43#1:47,5 +43#1:52 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt index 407a2dbb7ae..3e6db989d49 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.kt @@ -17,62 +17,3 @@ import test.* fun box(): String { return inlineFun("OK") } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineFun$2 -*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 - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,9:1 -7#2,2:10 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:10,2 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineFun$2 -+ 2 1.kt -test/_1Kt$inlineFun$1 -*L -1#1,13:1 -7#2:14 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap new file mode 100644 index 00000000000..cbebe8d2951 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/nested.smap @@ -0,0 +1,58 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$inlineFun$2 +*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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,20:1 +7#2,2:21 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +18#1:21,2 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$inlineFun$2 ++ 2 1.kt +test/_1Kt$inlineFun$1 +*L +1#1,13:1 +7#2:14 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt index 7263d5dae01..4aa15847380 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.kt @@ -15,41 +15,3 @@ import test.* fun box(): String { return inlineFun("OK") } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$inlineFun$1 -*L -1#1,11:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$inlineFun$1 -*L -1#1,9:1 -7#2,2:10 -7#3:12 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:10,2 -6#1:12 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap new file mode 100644 index 00000000000..795617691f5 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple.smap @@ -0,0 +1,37 @@ +// 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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$inlineFun$1 +*L +1#1,18:1 +7#2,2:19 +7#3:21 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +16#1:19,2 +16#1:21 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt index a182d77ba89..da3c51de878 100644 --- a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.kt @@ -41,41 +41,3 @@ import test.* fun box(): String { return lParams() } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$lParams$1 -*L -1#1,38:1 -*E - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -+ 3 1.kt -test/_1Kt$lParams$1 -*L -1#1,8:1 -31#2,5:9 -32#3:14 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9,5 -5#1:14 -*E diff --git a/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap new file mode 100644 index 00000000000..7b1f7f7ee59 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/defaultLambda/simple2.smap @@ -0,0 +1,37 @@ +// 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 +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt ++ 3 1.kt +test/_1Kt$lParams$1 +*L +1#1,44:1 +31#2,5:45 +32#3:50 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +42#1:45,5 +42#1:50 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/forInline.kt b/compiler/testData/codegen/boxInline/smap/forInline.kt index 65f67788e6d..52080658ba9 100644 --- a/compiler/testData/codegen/boxInline/smap/forInline.kt +++ b/compiler/testData/codegen/boxInline/smap/forInline.kt @@ -35,27 +35,3 @@ class SomeIterator { return "OK" } } - - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 2.kt -SomeIterator -*L -1#1,31:1 -21#2,6:32 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:32,6 -*E diff --git a/compiler/testData/codegen/boxInline/smap/forInline.smap b/compiler/testData/codegen/boxInline/smap/forInline.smap new file mode 100644 index 00000000000..338ddf0a9d0 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/forInline.smap @@ -0,0 +1,22 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 2.kt +SomeIterator +*L +1#1,38:1 +30#2,6:39 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +14#1:39,6 +*E diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt index c393d577c0f..0eb0b514c47 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.kt @@ -11,5 +11,3 @@ inline fun stub() { fun box(): String { return "KO".reversed() } - -// SMAP_FILE: 2.smap diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.smap new file mode 100644 index 00000000000..7d422a985bc --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmap.smap @@ -0,0 +1,3 @@ +// FILE: 1.kt + +// FILE: 2.kt diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.kt index 43871b6618a..f04188277c9 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.kt @@ -17,5 +17,3 @@ import test.* fun box(): String { return prop } - -// SMAP_FILE: 2.smap diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.smap new file mode 100644 index 00000000000..7d422a985bc --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/noSmapWithProperty.smap @@ -0,0 +1,3 @@ +// FILE: 1.kt + +// FILE: 2.kt diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt index df52f451ccd..3b6195aad79 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt @@ -15,25 +15,3 @@ fun box(): String { return "OK" } - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,12:1 -6#2:13 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:13 -*E diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.smap new file mode 100644 index 00000000000..240a3a64407 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.smap @@ -0,0 +1,22 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,18:1 +6#2:19 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:19 +*E diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt index a0f8ed93b3b..53789be38bc 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.kt @@ -15,25 +15,3 @@ fun box(): String { return "OK" } - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,12:1 -6#2:13 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:13 -*E diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.smap new file mode 100644 index 00000000000..cee1589aa7f --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reifiedProperty.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,18:1 +6#2:19 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:19 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.kt index 2fdba55bde7..18874b70d92 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.kt @@ -19,6 +19,5 @@ fun box(): String { }) } -// SMAP_FILE: 2.smap // See KT-23064 for the problem, InlineOnlySmapSkipper for an explanation, and // `stdlibInlineOnlyOneLine.kt` for the case where something should actually happen. diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.smap new file mode 100644 index 00000000000..7d422a985bc --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnly.smap @@ -0,0 +1,3 @@ +// FILE: 1.kt + +// FILE: 2.kt diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.kt index 356d23c7400..8c19968808c 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.kt @@ -14,18 +14,4 @@ fun box(): String { return "O".myLet(fun (it: String): String { return it + k }) } -// SMAP_FILE: 2.smap // See KT-23064 for the problem and InlineOnlySmapSkipper for an explanation. -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 fake.kt -kotlin/jvm/internal/FakeKt -*L -1#1,9:1 -1#2:10 -*E diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.smap b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.smap new file mode 100644 index 00000000000..e567c5c3c4a --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/stdlibInlineOnlyOneLine.smap @@ -0,0 +1,16 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 fake.kt +kotlin/jvm/internal/FakeKt +*L +1#1,18:1 +1#2:19 +*E diff --git a/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt b/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt index 1c4812aaa85..179dbcc4995 100644 --- a/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt +++ b/compiler/testData/codegen/boxInline/smap/interleavedFiles.kt @@ -19,37 +19,3 @@ fun box(): String { return "OK" } -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,17:1 -4#1:19 -7#1:21 -8#1:23 -4#1,7:24 -4#2:18 -4#2:20 -4#2:22 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -8#1:19 -13#1:21 -13#1:23 -13#1:24,7 -7#1:18 -9#1:20 -13#1:22 -*E diff --git a/compiler/testData/codegen/boxInline/smap/interleavedFiles.smap b/compiler/testData/codegen/boxInline/smap/interleavedFiles.smap new file mode 100644 index 00000000000..4faa5cbf2ff --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/interleavedFiles.smap @@ -0,0 +1,35 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,22:1 +9#1:24 +12#1:26 +13#1:28 +9#1,7:29 +4#2:23 +4#2:25 +4#2:27 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:24 +18#1:26 +18#1:28 +18#1:29,7 +12#1:23 +14#1:25 +18#1:27 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/kt23369.kt b/compiler/testData/codegen/boxInline/smap/kt23369.kt index 61a87a097fa..bf35526cf27 100644 --- a/compiler/testData/codegen/boxInline/smap/kt23369.kt +++ b/compiler/testData/codegen/boxInline/smap/kt23369.kt @@ -1,4 +1,3 @@ - // FILE: 1+a.kt package test @@ -13,27 +12,3 @@ import test.* fun box(): String { return inlineFun { "OK" } } - -// SMAP_FILE: 1+a.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1+a.kt -test/_1_aKt -*L -1#1,8:1 -7#2:9 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9 -*E diff --git a/compiler/testData/codegen/boxInline/smap/kt23369.smap b/compiler/testData/codegen/boxInline/smap/kt23369.smap new file mode 100644 index 00000000000..62b73bef34c --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/kt23369.smap @@ -0,0 +1,23 @@ +// FILE: 1+a.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1+a.kt +test/_1_aKt +*L +1#1,15:1 +6#2:16 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:16 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_2.kt b/compiler/testData/codegen/boxInline/smap/kt23369_2.kt index b73957a898a..4d5c889eaa7 100644 --- a/compiler/testData/codegen/boxInline/smap/kt23369_2.kt +++ b/compiler/testData/codegen/boxInline/smap/kt23369_2.kt @@ -1,4 +1,3 @@ - // FILE: a.kt package test @@ -13,27 +12,3 @@ import test.* fun box(): String { return inlineFun { "OK" } } - -// SMAP_FILE: 1+ a.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1+ a.kt -test/_1__aKt -*L -1#1,8:1 -7#2:9 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9 -*E diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_2.smap b/compiler/testData/codegen/boxInline/smap/kt23369_2.smap new file mode 100644 index 00000000000..24cfad8d562 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/kt23369_2.smap @@ -0,0 +1,23 @@ +// FILE: a.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 a.kt +test/AKt +*L +1#1,15:1 +6#2:16 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:16 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_3.kt b/compiler/testData/codegen/boxInline/smap/kt23369_3.kt index 232b944d8cc..4d5c889eaa7 100644 --- a/compiler/testData/codegen/boxInline/smap/kt23369_3.kt +++ b/compiler/testData/codegen/boxInline/smap/kt23369_3.kt @@ -1,4 +1,3 @@ - // FILE: a.kt package test @@ -13,27 +12,3 @@ import test.* fun box(): String { return inlineFun { "OK" } } - -// SMAP_FILE: + a.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 + a.kt -test/__aKt -*L -1#1,8:1 -7#2:9 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9 -*E diff --git a/compiler/testData/codegen/boxInline/smap/kt23369_3.smap b/compiler/testData/codegen/boxInline/smap/kt23369_3.smap new file mode 100644 index 00000000000..24cfad8d562 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/kt23369_3.smap @@ -0,0 +1,23 @@ +// FILE: a.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 a.kt +test/AKt +*L +1#1,15:1 +6#2:16 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +13#1:16 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/kt35006.kt b/compiler/testData/codegen/boxInline/smap/kt35006.kt index cae42315fd2..43a843d5fb4 100644 --- a/compiler/testData/codegen/boxInline/smap/kt35006.kt +++ b/compiler/testData/codegen/boxInline/smap/kt35006.kt @@ -14,30 +14,3 @@ fun box(): String { // KotlinDebug: "OK" } } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,12:1 -5#2:13 -4#2:14 -4#2:15 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:13 -6#1:14 -7#1:15 -*E diff --git a/compiler/testData/codegen/boxInline/smap/kt35006.smap b/compiler/testData/codegen/boxInline/smap/kt35006.smap new file mode 100644 index 00000000000..6c40aa2d1cb --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/kt35006.smap @@ -0,0 +1,27 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,17:1 +5#2:18 +4#2:19 +4#2:20 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +11#1:18 +12#1:19 +13#1:20 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt b/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt index 2630e94a90b..e9de5ba6c8e 100644 --- a/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt +++ b/compiler/testData/codegen/boxInline/smap/multiFileFacade.kt @@ -13,43 +13,3 @@ inline fun foo2(l: () -> String): String = foo(l) // FILE: 2.kt fun box(): String = foo { "OK" } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -Facade___1Kt -*L -1#1,13:1 -8#1:14 -*S KotlinDebug -*F -+ 1 1.kt -Facade___1Kt -*L -10#1:14 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -Facade___1Kt -*L -1#1,5:1 -8#2:6 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -3#1:6 -*E diff --git a/compiler/testData/codegen/boxInline/smap/multiFileFacade.smap b/compiler/testData/codegen/boxInline/smap/multiFileFacade.smap new file mode 100644 index 00000000000..27954fbe5af --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/multiFileFacade.smap @@ -0,0 +1,40 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +Facade___1Kt +*L +1#1,13:1 +8#1:14 +*S KotlinDebug +*F ++ 1 1.kt +Facade___1Kt +*L +10#1:14 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +Facade___1Kt +*L +1#1,16:1 +8#2:17 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +15#1:17 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt index 7d52d3f349f..b49e4f8e9fc 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt @@ -1,4 +1,3 @@ - // FILE: 1.kt package test @@ -26,29 +25,3 @@ fun box(): String { return result } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,18:1 -7#2,4:19 -7#2,4:23 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -7#1:19,4 -11#1:23,4 -*E diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.smap b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.smap new file mode 100644 index 00000000000..d8e74dd03d6 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.smap @@ -0,0 +1,25 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,28:1 +6#2,4:29 +6#2,4:33 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +18#1:29,4 +22#1:33,4 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt index 3bccd7b875b..d4529a58e90 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt @@ -1,4 +1,3 @@ - // FILE: 1.kt package test @@ -29,73 +28,3 @@ fun box(): String { return result } - - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$test$1 -+ 2 1.kt -test/_1Kt -*L -1#1,19:1 -7#2,3:20 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$test$1 -*L -14#1:20,3 -*E - - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,16:1 -12#2,6:17 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -8#1:17,6 -*E - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt$test$1 -+ 2 1.kt -test/_1Kt -+ 3 2.kt -_2Kt -*L -1#1,19:1 -7#2,2:20 -9#2:24 -9#3,2:22 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt$test$1 -*L -14#1:20,2 -14#1:24 -*E diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.smap b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.smap new file mode 100644 index 00000000000..9aa907d6c45 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.smap @@ -0,0 +1,67 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$test$1 ++ 2 1.kt +test/_1Kt +*L +1#1,18:1 +6#2,3:19 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$test$1 +*L +13#1:19,3 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,31:1 +11#2,6:32 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +25#1:32,6 +*E + +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt$test$1 ++ 2 1.kt +test/_1Kt ++ 3 2.kt +_2Kt +*L +1#1,18:1 +6#2,2:19 +8#2:23 +26#3,2:21 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$test$1 +*L +13#1:19,2 +13#1:23 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt index 7ffadc5f40d..b53a141a4a5 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt @@ -1,4 +1,3 @@ - // NO_CHECK_LAMBDA_INLINING // FILE: 1.kt package test @@ -32,48 +31,3 @@ fun box(): String { return result } - - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,20:1 -7#2,4:21 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -8#1:21,4 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$box$1$1 -+ 2 1.kt -test/_1Kt -*L -1#1,20:1 -13#2,3:21 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt$box$1$1 -*L -10#1:21,3 -*E diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.smap b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.smap new file mode 100644 index 00000000000..5740242bf9c --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.smap @@ -0,0 +1,43 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,34:1 +6#2,4:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +24#1:35,4 +*E + +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt$box$1$1 ++ 2 1.kt +test/_1Kt +*L +1#1,34:1 +12#2,3:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1$1 +*L +26#1:35,3 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt index 13166690a2b..df77eecc24d 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt @@ -1,4 +1,3 @@ - // NO_CHECK_LAMBDA_INLINING // FILE: 1.kt package test @@ -32,48 +31,3 @@ fun box(): String { return result } - - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,26:1 -7#2,4:27 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -14#1:27,4 -*E - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt$box$1$1 -+ 2 2.kt -_2Kt -*L -1#1,26:1 -6#2,3:27 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt$box$1$1 -*L -16#1:27,3 -*E diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.smap b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.smap new file mode 100644 index 00000000000..4510273b380 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.smap @@ -0,0 +1,43 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,34:1 +6#2,4:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +24#1:35,4 +*E + +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt$box$1$1 ++ 2 2.kt +_2Kt +*L +1#1,34:1 +16#2,3:35 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1$1 +*L +26#1:35,3 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/oneFile.kt b/compiler/testData/codegen/boxInline/smap/oneFile.kt index 0fbf18955b5..3726efd7a06 100644 --- a/compiler/testData/codegen/boxInline/smap/oneFile.kt +++ b/compiler/testData/codegen/boxInline/smap/oneFile.kt @@ -1,4 +1,3 @@ - // FILE: 1.kt package zzz @@ -18,26 +17,3 @@ inline fun test(p: () -> String): String { pd = "O" return pd + p() } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -//TODO should be empty -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -*L -1#1,15:1 -10#1,3:16 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -4#1:16,3 -*E diff --git a/compiler/testData/codegen/boxInline/smap/oneFile.smap b/compiler/testData/codegen/boxInline/smap/oneFile.smap new file mode 100644 index 00000000000..1815d297196 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/oneFile.smap @@ -0,0 +1,21 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt +*L +1#1,20:1 +16#1,3:21 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +10#1:21,3 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/rangeFolding.kt b/compiler/testData/codegen/boxInline/smap/rangeFolding.kt index a98fe3f8297..95b62a5afd2 100644 --- a/compiler/testData/codegen/boxInline/smap/rangeFolding.kt +++ b/compiler/testData/codegen/boxInline/smap/rangeFolding.kt @@ -26,49 +26,3 @@ fun box(): String { together() return "OK" } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt -*L -1#1,14:1 -4#1:15 -6#1:16 -5#1:17 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt -*L -9#1:15 -10#1:16 -11#1:17 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,17:1 -9#2:18 -4#2,9:19 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -13#1:18 -13#1:19,9 -*E diff --git a/compiler/testData/codegen/boxInline/smap/rangeFolding.smap b/compiler/testData/codegen/boxInline/smap/rangeFolding.smap new file mode 100644 index 00000000000..87c98b01cb1 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/rangeFolding.smap @@ -0,0 +1,46 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt +*L +1#1,14:1 +4#1:15 +6#1:16 +5#1:17 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt +*L +9#1:15 +10#1:16 +11#1:17 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,29:1 +9#2:30 +4#2,9:31 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +26#1:30 +26#1:31,9 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt index 593dcdc9335..aa9e188e39b 100644 --- a/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt +++ b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.kt @@ -28,71 +28,3 @@ fun box(): String { X.foo() return "OK" } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/D -+ 2 1.kt -test/A -+ 3 1.kt -test/C -+ 4 1.kt -test/B -*L -1#1,16:1 -4#2:17 -6#3:18 -5#4:19 -*S KotlinDebug -*F -+ 1 1.kt -test/D -*L -10#1:17 -11#1:18 -12#1:19 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -X -+ 2 1.kt -test/D -+ 3 1.kt -test/A -+ 4 1.kt -test/C -+ 5 1.kt -test/B -*L -1#1,17:1 -10#2:18 -11#2:20 -12#2:22 -13#2:24 -4#3:19 -6#4:21 -5#5:23 -*S KotlinDebug -*F -+ 1 2.kt -X -*L -9#1:18 -9#1:20 -9#1:22 -9#1:24 -9#1:19 -9#1:21 -9#1:23 -*E diff --git a/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.smap b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.smap new file mode 100644 index 00000000000..7d0ddddb003 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/rangeFoldingInClass.smap @@ -0,0 +1,68 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/D ++ 2 1.kt +test/A ++ 3 1.kt +test/C ++ 4 1.kt +test/B +*L +1#1,16:1 +4#2:17 +6#3:18 +5#4:19 +*S KotlinDebug +*F ++ 1 1.kt +test/D +*L +10#1:17 +11#1:18 +12#1:19 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +X ++ 2 1.kt +test/D ++ 3 1.kt +test/A ++ 4 1.kt +test/C ++ 5 1.kt +test/B +*L +1#1,31:1 +10#2:32 +11#2:34 +12#2:36 +13#2:38 +4#3:33 +6#4:35 +5#5:37 +*S KotlinDebug +*F ++ 1 2.kt +X +*L +24#1:32 +24#1:34 +24#1:36 +24#1:38 +24#1:33 +24#1:35 +24#1:37 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt index 1e8e648e190..dc3ba752d5c 100644 --- a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt @@ -17,27 +17,3 @@ fun box(): String { return if (p == 1 && l == 11) "OK" else "fail: $p" } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -zzz/_1Kt -*L -1#1,11:1 -7#2,3:12 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -6#1:12,3 -*E diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.smap b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.smap new file mode 100644 index 00000000000..cc5a8855a9a --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +zzz/_1Kt +*L +1#1,20:1 +7#2,3:21 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +16#1:21,3 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt index a4c6ff6dfa1..3b1f836253a 100644 --- a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt @@ -18,27 +18,3 @@ fun box(): String { return if (p == 15) "OK" else "fail: $p" } - -// SMAP_FILE: 1.smap - -// SMAP_FILE: 2.smap - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -zzz/_1Kt -*L -1#1,14:1 -7#2:15 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -7#1:15 -*E diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.smap b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.smap new file mode 100644 index 00000000000..7698b306bf0 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.smap @@ -0,0 +1,23 @@ +// FILE: 1.kt + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +zzz/_1Kt +*L +1#1,21:1 +7#2:22 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +15#1:22 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/smap.kt b/compiler/testData/codegen/boxInline/smap/smap.kt index b43c582f6db..ee041de75c1 100644 --- a/compiler/testData/codegen/boxInline/smap/smap.kt +++ b/compiler/testData/codegen/boxInline/smap/smap.kt @@ -42,78 +42,3 @@ fun box(): String { return expected } - -// SMAP_FILE: 1.smap - -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -builders/_1Kt -*L -1#1,22:1 -11#1,3:23 -7#1,2:26 -*S KotlinDebug -*F -+ 1 1.kt -builders/_1Kt -*L -15#1:23,3 -19#1:26,2 -*E - -// SMAP_FILE: 2.smap - - -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -builders/_1Kt -*L -1#1,25:1 -7#1,3:33 -10#1:38 -11#1,2:42 -13#1:45 -15#1:47 -19#2:26 -7#2:27 -15#2:28 -11#2,3:29 -8#2:32 -19#2:36 -7#2:37 -15#2:39 -11#2,2:40 -13#2:44 -8#2:46 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -20#1:33,3 -20#1:38 -20#1:42,2 -20#1:45 -20#1:47 -9#1:26 -9#1:27 -10#1:28 -10#1:29,3 -9#1:32 -20#1:36 -20#1:37 -20#1:39 -20#1:40,2 -20#1:44 -20#1:46 -*E diff --git a/compiler/testData/codegen/boxInline/smap/smap.smap b/compiler/testData/codegen/boxInline/smap/smap.smap new file mode 100644 index 00000000000..dfcb64f0cfc --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/smap.smap @@ -0,0 +1,72 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +builders/_1Kt +*L +1#1,22:1 +11#1,3:23 +7#1,2:26 +*S KotlinDebug +*F ++ 1 1.kt +builders/_1Kt +*L +15#1:23,3 +19#1:26,2 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +builders/_1Kt +*L +1#1,45:1 +28#1,3:53 +31#1:58 +32#1,2:62 +34#1:65 +36#1:67 +19#2:46 +7#2:47 +15#2:48 +11#2,3:49 +8#2:52 +19#2:56 +7#2:57 +15#2:59 +11#2,2:60 +13#2:64 +8#2:66 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +41#1:53,3 +41#1:58 +41#1:62,2 +41#1:65 +41#1:67 +30#1:46 +30#1:47 +31#1:48 +31#1:49,3 +30#1:52 +41#1:56 +41#1:57 +41#1:59 +41#1:60,2 +41#1:64 +41#1:66 +*E + diff --git a/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.kt b/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.kt index e2d0d0fff0d..3700972236d 100644 --- a/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.kt +++ b/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.kt @@ -18,45 +18,3 @@ import test.* fun box(): String { return inlineFun() } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt -*L -1#1,15:1 -6#1:16 -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt -*L -10#1:16 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,8:1 -10#2:9 -6#2,6:10 -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9 -5#1:10,6 -*E diff --git a/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.smap b/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.smap new file mode 100644 index 00000000000..8ce6a92c6aa --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/smapWithNewSyntax.smap @@ -0,0 +1,41 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt +*L +1#1,15:1 +6#1:16 +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt +*L +10#1:16 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,21:1 +10#2:22 +6#2,6:23 +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +19#1:22 +19#1:23,6 +*E diff --git a/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.kt b/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.kt index 0413447a45d..1e14e462a6a 100644 --- a/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.kt +++ b/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.kt @@ -18,47 +18,3 @@ import test.* fun box(): String { return inlineFun() } - -// SMAP_FILE: 1.smap -SMAP -1.kt -Kotlin -*S Kotlin -*F -+ 1 1.kt -test/_1Kt -*L -1#1,15:1 -6#1:16 -*E -*S KotlinDebug -*F -+ 1 1.kt -test/_1Kt -*L -10#1:16 -*E - -// SMAP_FILE: 2.smap -SMAP -2.kt -Kotlin -*S Kotlin -*F -+ 1 2.kt -_2Kt -+ 2 1.kt -test/_1Kt -*L -1#1,8:1 -10#2:9 -6#2,6:10 -*E -*S KotlinDebug -*F -+ 1 2.kt -_2Kt -*L -5#1:9 -5#1,6:10 -*E diff --git a/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.smap b/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.smap new file mode 100644 index 00000000000..6ea43a0c918 --- /dev/null +++ b/compiler/testData/codegen/boxInline/smap/smapWithOldSyntax.smap @@ -0,0 +1,43 @@ +// FILE: 1.kt +SMAP +1.kt +Kotlin +*S Kotlin +*F ++ 1 1.kt +test/_1Kt +*L +1#1,15:1 +6#1:16 +*E +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt +*L +10#1:16 +*E + +// FILE: 2.kt +SMAP +2.kt +Kotlin +*S Kotlin +*F ++ 1 2.kt +_2Kt ++ 2 1.kt +test/_1Kt +*L +1#1,21:1 +10#2:22 +6#2,6:23 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +19#1:22 +19#1,6:23 +*E diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt index 02e0ca244e5..8d436f15936 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/backend/handlers/SMAPDumpHandler.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.codegen.getClassFiles import org.jetbrains.kotlin.codegen.inline.GENERATE_SMAP import org.jetbrains.kotlin.test.directives.CodegenTestDirectives import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_SMAP +import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.NO_SMAP_DUMP import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.SEPARATE_SMAP_DUMPS import org.jetbrains.kotlin.test.directives.model.DirectivesContainer import org.jetbrains.kotlin.test.model.BinaryArtifacts @@ -29,13 +30,21 @@ class SMAPDumpHandler(testServices: TestServices) : JvmBinaryArtifactHandler(tes override val directivesContainers: List get() = listOf(CodegenTestDirectives) - private val dumper = MultiModuleInfoDumperImpl() + private val dumper = MultiModuleInfoDumperImpl(moduleHeaderTemplate = null) override fun processModule(module: TestModule, info: BinaryArtifacts.Jvm) { if (!GENERATE_SMAP) return if (DUMP_SMAP !in module.directives) return - val compiledSmaps = CommonSMAPTestUtil.extractSMAPFromClasses(info.classFileFactory.getClassFiles()) + val originalFileNames = module.files.map { it.name } + + val compiledSmaps = CommonSMAPTestUtil.extractSMAPFromClasses(info.classFileFactory.getClassFiles()).mapNotNull { + val name = it.sourceFile.removePrefix("/") + val index = originalFileNames.indexOf(name) + val testFile = module.files[index] + if (NO_SMAP_DUMP in testFile.directives) return@mapNotNull null + index to it + }.sortedBy { it.first }.map { it.second } CommonSMAPTestUtil.checkNoConflictMappings(compiledSmaps, assertions) @@ -48,7 +57,7 @@ class SMAPDumpHandler(testServices: TestServices) : JvmBinaryArtifactHandler(tes dumper.builderForModule(module).apply { for (source in compiledData.values) { - appendLine("// FILE: ${source.sourceFile}") + appendLine("// FILE: ${source.sourceFile.removePrefix("/")}") appendLine(source.smap ?: "") } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt index 61709ae7915..97c16f3c67f 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/directives/CodegenTestDirectives.kt @@ -105,6 +105,11 @@ object CodegenTestDirectives : SimpleDirectivesContainer() { description = """Enables ${SMAPDumpHandler::class}""" ) + val NO_SMAP_DUMP by directive( + description = "Don't dump smap for marked file", + applicability = File + ) + val SEPARATE_SMAP_DUMPS by directive( description = """ If enabled then ${SMAPDumpHandler::class} will dump smap dumps diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt index 021f3ec7b37..d80e83e5a50 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/BaseCodegenConfiguration.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.test.Constructor import org.jetbrains.kotlin.test.backend.handlers.* import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder +import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_SMAP import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.RUN_DEX_CHECKER import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.USE_PSI_CLASS_FILES_READING import org.jetbrains.kotlin.test.model.* @@ -66,6 +67,13 @@ fun TestConfigurationBuilder.commonHandlersForCodegenTest() { fun TestConfigurationBuilder.useInlineHandlers() { useArtifactsHandlers( - ::BytecodeInliningHandler + ::BytecodeInliningHandler, + ::SMAPDumpHandler ) + + forTestsMatching("compiler/testData/codegen/boxInline/smap/*") { + defaultDirectives { + +DUMP_SMAP + } + } } diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/MultiModuleInfoDumper.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/MultiModuleInfoDumper.kt index 58e705fc21d..885404fabef 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/MultiModuleInfoDumper.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/utils/MultiModuleInfoDumper.kt @@ -14,7 +14,7 @@ abstract class MultiModuleInfoDumper { } // TODO: consider about tests with multiple testdata files -class MultiModuleInfoDumperImpl(private val moduleHeaderTemplate: String = "Module: %s") : MultiModuleInfoDumper() { +class MultiModuleInfoDumperImpl(private val moduleHeaderTemplate: String? = "Module: %s") : MultiModuleInfoDumper() { private val builderByModule = LinkedHashMap() override fun builderForModule(module: TestModule): StringBuilder { @@ -25,7 +25,7 @@ class MultiModuleInfoDumperImpl(private val moduleHeaderTemplate: String = "Modu builderByModule.values.singleOrNull()?.let { return it.toString() } return buildString { for ((module, builder) in builderByModule) { - appendLine(String.format(moduleHeaderTemplate, module.name)) + moduleHeaderTemplate?.let { appendLine(String.format(it, module.name)) } append(builder) } }