From 68f5e4d10efd46a3950436c7471519fb623218f8 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 19 Apr 2016 17:52:27 +0300 Subject: [PATCH] Added debug strata to test data --- .../boxInline/smap/anonymous/lambda.kt | 7 +++++ .../smap/anonymous/lambdaOnCallSite.kt | 7 +++++ .../smap/anonymous/lambdaOnInlineCallSite.kt | 10 +++++++ .../boxInline/smap/anonymous/object.kt | 7 +++++ .../smap/anonymous/objectOnCallSite.kt | 7 +++++ .../smap/anonymous/objectOnInlineCallSite.kt | 10 +++++++ .../severalMappingsForDefaultFile.kt | 8 +++++ .../codegen/boxInline/smap/assertion.kt | 8 +++++ .../boxInline/smap/classFromDefaultPackage.kt | 7 +++++ .../boxInline/smap/inlineOnly/reified.kt | 7 +++++ .../smap/newsmap/differentMapping.kt | 8 +++++ .../smap/newsmap/mappingInInlineFunLambda.kt | 17 ++++++++++- .../smap/newsmap/mappingInSubInlineLambda.kt | 14 +++++++++ .../mappingInSubInlineLambdaSameFileInline.kt | 14 +++++++++ .../codegen/boxInline/smap/oneFile.kt | 7 +++++ .../boxInline/smap/resolve/inlineComponent.kt | 11 ++++++- .../boxInline/smap/resolve/inlineIterator.kt | 7 +++++ .../testData/codegen/boxInline/smap/smap.kt | 29 +++++++++++++++++++ 18 files changed, 183 insertions(+), 2 deletions(-) diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt index ce7fb1f98ad..3f82fde796e 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambda.kt @@ -56,6 +56,13 @@ builders/_1Kt 1#1,21:1 6#2:22 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +9#1:22 +*E SMAP 1.kt diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt index 0b6389d0b57..f7169da1615 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnCallSite.kt @@ -46,3 +46,10 @@ builders/_1Kt 1#1,23:1 6#2:24 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +9#1:24 +*E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt index 69a0c1705ca..e2f10bcb355 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/lambdaOnInlineCallSite.kt @@ -53,6 +53,16 @@ builders/_1Kt 6#2:25 6#2:29 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +20#1,3:26 +20#1,6:30 +9#1:25 +20#1:29 +*E SMAP 2.kt diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt index 11e77afbd95..0e9302a1c7f 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/object.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/object.kt @@ -59,6 +59,13 @@ builders/_1Kt 1#1,22:1 6#2,5:23 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +9#1,5:23 +*E SMAP 1.kt diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt index d5faa361a9b..4b9ff66f07c 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnCallSite.kt @@ -49,3 +49,10 @@ builders/_1Kt 1#1,26:1 6#2:27 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +9#1:27 +*E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt index 2835e4aa4b1..8f2143a5718 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/objectOnInlineCallSite.kt @@ -54,6 +54,16 @@ builders/_1Kt 6#2:27 6#2:31 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +22#1,3:28 +22#1,8:32 +9#1:27 +22#1:31 +*E SMAP 2.kt diff --git a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt index 63d849a5aab..cb9a25229c6 100644 --- a/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt +++ b/compiler/testData/codegen/boxInline/smap/anonymous/severalMappingsForDefaultFile.kt @@ -51,6 +51,14 @@ test/_1Kt 9#2:19 5#2:20 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +7#1:19 +7#1:20 +*E SMAP 1.kt diff --git a/compiler/testData/codegen/boxInline/smap/assertion.kt b/compiler/testData/codegen/boxInline/smap/assertion.kt index 5476eb0e411..f36b0005a6d 100644 --- a/compiler/testData/codegen/boxInline/smap/assertion.kt +++ b/compiler/testData/codegen/boxInline/smap/assertion.kt @@ -64,4 +64,12 @@ test/_1Kt 1#1,14:1 17#2,7:15 8#2,7:22 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +6#1,7:15 +7#1,7:22 *E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt index 3a87adb76cd..8e1691d5627 100644 --- a/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt +++ b/compiler/testData/codegen/boxInline/smap/classFromDefaultPackage.kt @@ -27,3 +27,10 @@ A 1#1,9:1 4#2:10 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +4#1:10 +*E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt index a6d9cf0e108..81b49d5f9d9 100644 --- a/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt +++ b/compiler/testData/codegen/boxInline/smap/inlineOnly/reified.kt @@ -30,3 +30,10 @@ test/_1Kt 1#1,12:1 5#2:13 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +6#1:13 +*E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt index 1abfbac8056..827b03b864d 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/differentMapping.kt @@ -43,4 +43,12 @@ test/_1Kt 1#1,18:1 6#2,4:19 6#2,4:23 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +7#1,4:19 +11#1,4:23 *E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt index 72c92edf077..1f2d9ae0f9f 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInInlineFunLambda.kt @@ -44,6 +44,14 @@ test/_1Kt 1#1,18:1 6#2,3:19 *E +*S KotlinDebug +*F ++ 1 1.kt +test/_1Kt$test$1 +*L +13#1,3:19 +*E + // FILE: 2.smap @@ -60,6 +68,13 @@ test/_1Kt 1#1,16:1 11#2,6:17 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +8#1,6:17 +*E SMAP 1.kt @@ -76,4 +91,4 @@ _2Kt 1#1,18:1 6#2,3:19 9#3,2:22 -*E \ No newline at end of file +*E diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt index cd254f4e88a..94873cd3d78 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambda.kt @@ -50,6 +50,13 @@ test/_1Kt 1#1,20:1 6#2,4:21 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +8#1,4:21 +*E SMAP 2.kt @@ -63,4 +70,11 @@ test/_1Kt *L 1#1,20:1 12#2,3:21 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1$1 +*L +10#1,3:21 *E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt index 9544a5e73f3..8d7265f73b2 100644 --- a/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt +++ b/compiler/testData/codegen/boxInline/smap/newsmap/mappingInSubInlineLambdaSameFileInline.kt @@ -50,6 +50,13 @@ test/_1Kt 1#1,26:1 6#2,4:27 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +14#1,4:27 +*E SMAP 2.kt @@ -63,4 +70,11 @@ _2Kt *L 1#1,26:1 6#2,3:27 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt$box$1$1 +*L +16#1,3:27 *E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/oneFile.kt b/compiler/testData/codegen/boxInline/smap/oneFile.kt index 9b628031d03..b68666e3677 100644 --- a/compiler/testData/codegen/boxInline/smap/oneFile.kt +++ b/compiler/testData/codegen/boxInline/smap/oneFile.kt @@ -34,3 +34,10 @@ _2Kt 1#1,15:1 10#1,3:16 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +4#1,3:16 +*E diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt index 60d3c782b38..53ec690a6a9 100644 --- a/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineComponent.kt @@ -33,5 +33,14 @@ _2Kt zzz/_1Kt *L 1#1,11:1 -7#2,3:12 +7#2:12 +9#2:13 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +6#1:12 +6#1:13 +*E \ No newline at end of file diff --git a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt index 571816ffc22..e2453a51e19 100644 --- a/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt +++ b/compiler/testData/codegen/boxInline/smap/resolve/inlineIterator.kt @@ -36,3 +36,10 @@ zzz/_1Kt 1#1,14:1 7#2:15 *E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +7#1:15 +*E diff --git a/compiler/testData/codegen/boxInline/smap/smap.kt b/compiler/testData/codegen/boxInline/smap/smap.kt index 30201c17eb9..77ef4128490 100644 --- a/compiler/testData/codegen/boxInline/smap/smap.kt +++ b/compiler/testData/codegen/boxInline/smap/smap.kt @@ -56,6 +56,14 @@ builders/_1Kt 10#1,3:22 6#1,2:25 *E +*S KotlinDebug +*F ++ 1 1.kt +builders/_1Kt +*L +14#1,3:22 +18#1,2:25 +*E // FILE: 2.smap @@ -86,4 +94,25 @@ builders/_1Kt 10#2,2:47 12#2:51 7#2:53 +*E +*S KotlinDebug +*F ++ 1 2.kt +_2Kt +*L +20#1,3:40 +20#1:45 +20#1,2:49 +20#1:52 +20#1:54 +9#1:26 +9#1,9:27 +9#1,3:36 +9#1:39 +20#1:43 +20#1:44 +20#1:46 +20#1,2:47 +20#1:51 +20#1:53 *E \ No newline at end of file