From 20e4efaeabb0986165769b8f4307417967e53a3d Mon Sep 17 00:00:00 2001 From: Ilmir Usmanov Date: Fri, 1 Feb 2019 17:32:37 +0300 Subject: [PATCH] Fix test data --- .../codegen/bytecodeText/boxingOptimization/maxMinBy.kt | 4 ++-- .../capturedVarsOptimization/sharedSlotsWithCapturedVars.kt | 4 ++-- .../coroutines/debug/localVariableCorrectLabel.kt | 2 +- .../testData/codegen/bytecodeText/forLoop/loopVarInterval.kt | 2 +- .../codegen/bytecodeText/inline/inlineArgumentSlots.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/boxing.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/boxingVar.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/generics.kt | 2 +- .../bytecodeText/localInitializationLVT/genericsVar.kt | 2 +- .../bytecodeText/localInitializationLVT/inlineClass.kt | 2 +- .../bytecodeText/localInitializationLVT/inlineClassVar.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/lateinit.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/run.kt | 2 +- .../codegen/bytecodeText/localInitializationLVT/runVar.kt | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt b/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt index bf55f7f6d84..ce874385582 100644 --- a/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt +++ b/compiler/testData/codegen/bytecodeText/boxingOptimization/maxMinBy.kt @@ -27,8 +27,8 @@ fun box(): String { // -- no compareTo // 0 compareTo // -- comparisons are properly fused with conditional jumps -// comparisons: 0 + fake inline variables: 8 -// 8 ICONST_0 +// comparisons: 0 + fake inline variables: 12 +// 12 ICONST_0 // 1 IF_ICMPGE // 1 IF_ICMPLE // 4 LCMP diff --git a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt index 2948c0e76d6..b0af2d2c7c8 100644 --- a/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt +++ b/compiler/testData/codegen/bytecodeText/capturedVarsOptimization/sharedSlotsWithCapturedVars.kt @@ -19,8 +19,8 @@ fun box(): String { // Shared variable slots (x1, x2): -// 4 ILOAD 2 -// 4 ISTORE 2 +// 4 ILOAD 6 +// 4 ISTORE 6 // Temporary variable slots for 'x2++' + store to fake index: // 0 ILOAD 1 diff --git a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt index 5caeeef3d83..ae44d2b3ac6 100644 --- a/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt +++ b/compiler/testData/codegen/bytecodeText/coroutines/debug/localVariableCorrectLabel.kt @@ -14,7 +14,7 @@ fun main(args: Array) { @BuilderInference suspend fun SequenceScope.awaitSeq(): Int = 42 -// 1 LOCALVARIABLE a I L19 L23 3 +// 1 LOCALVARIABLE a I L19 L.* 3 // 1 LINENUMBER 8 L19 // Adding ignore flags below the test since the test relies on line numbers. // IGNORE_BACKEND: JVM_IR diff --git a/compiler/testData/codegen/bytecodeText/forLoop/loopVarInterval.kt b/compiler/testData/codegen/bytecodeText/forLoop/loopVarInterval.kt index 4dda5d81746..6dbc95b5818 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/loopVarInterval.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/loopVarInterval.kt @@ -7,4 +7,4 @@ fun f() { // 1 ISTORE 0\s+L3 // 1 ILOAD 0\s+INVOKEVIRTUAL java/io/PrintStream.print \(C\)V -// 1 LOCALVARIABLE c C L3 L7 0 +// 1 LOCALVARIABLE c C L3 L.* 0 diff --git a/compiler/testData/codegen/bytecodeText/inline/inlineArgumentSlots.kt b/compiler/testData/codegen/bytecodeText/inline/inlineArgumentSlots.kt index e1310b36f23..e3ebab1620c 100644 --- a/compiler/testData/codegen/bytecodeText/inline/inlineArgumentSlots.kt +++ b/compiler/testData/codegen/bytecodeText/inline/inlineArgumentSlots.kt @@ -51,4 +51,4 @@ class A { fun calcRequiredLayoutSize(count: Int, max: Int, toInt: Int) = 0 -// 2 ISTORE 10 \ No newline at end of file +// 3 ISTORE 10 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxing.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxing.kt index 4ff0ddb8e3f..41d3f82e3f5 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxing.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxing.kt @@ -9,4 +9,4 @@ fun test(): java.lang.Integer { } // 2 ASTORE 0 -// 1 LOCALVARIABLE c Ljava/lang/Integer; L1 L11 0 \ No newline at end of file +// 1 LOCALVARIABLE c Ljava/lang/Integer; L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxingVar.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxingVar.kt index feffd901d03..43eaed7ed62 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxingVar.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/boxingVar.kt @@ -9,4 +9,4 @@ fun test(): java.lang.Integer { } // 1 ASTORE 0 -// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$ObjectRef; L1 L11 0 \ No newline at end of file +// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$ObjectRef; L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/generics.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/generics.kt index a9f44d895d3..8ccb7758d26 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/generics.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/generics.kt @@ -15,4 +15,4 @@ fun test() { // two in foo and two in test // 4 ASTORE 2 -// 1 LOCALVARIABLE t\$iv Ljava/lang/Object; L3 L13 2 \ No newline at end of file +// 1 LOCALVARIABLE t\$iv Ljava/lang/Object; L3 L.* 2 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/genericsVar.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/genericsVar.kt index 711caf60550..1c7f01ae41a 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/genericsVar.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/genericsVar.kt @@ -15,4 +15,4 @@ fun test() { // two in foo and two in test // 2 ASTORE 2 -// 1 LOCALVARIABLE t\$iv Lkotlin/jvm/internal/Ref\$ObjectRef; L3 L13 2 \ No newline at end of file +// 1 LOCALVARIABLE t\$iv Lkotlin/jvm/internal/Ref\$ObjectRef; L3 L.* 2 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClass.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClass.kt index c89e6d420a1..9c7c11e89ad 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClass.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClass.kt @@ -9,4 +9,4 @@ fun test(): UInt { } // 2 ISTORE 0 -// 1 LOCALVARIABLE c I L1 L11 0 \ No newline at end of file +// 1 LOCALVARIABLE c I L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClassVar.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClassVar.kt index 9664a162f40..965edbe85f4 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClassVar.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/inlineClassVar.kt @@ -9,4 +9,4 @@ fun test(): UInt { } // 1 ASTORE 0 -// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$IntRef; L1 L11 0 \ No newline at end of file +// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$IntRef; L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/lateinit.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/lateinit.kt index 6ca95e61539..4cf3eafe28f 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/lateinit.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/lateinit.kt @@ -9,4 +9,4 @@ fun test(): Char { } // 2 ASTORE 0 -// 1 LOCALVARIABLE c Ljava/lang/Object; L1 L12 0 \ No newline at end of file +// 1 LOCALVARIABLE c Ljava/lang/Object; L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/run.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/run.kt index e4492232e56..4a2d2cf704f 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/run.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/run.kt @@ -11,4 +11,4 @@ fun test(): Char { // The first on declaration, the other on initialization // 2 ISTORE 0 -// 1 LOCALVARIABLE c C L1 L14 0 \ No newline at end of file +// 1 LOCALVARIABLE c C L1 L.* 0 \ No newline at end of file diff --git a/compiler/testData/codegen/bytecodeText/localInitializationLVT/runVar.kt b/compiler/testData/codegen/bytecodeText/localInitializationLVT/runVar.kt index 4639ea6fe78..3773b476bd1 100644 --- a/compiler/testData/codegen/bytecodeText/localInitializationLVT/runVar.kt +++ b/compiler/testData/codegen/bytecodeText/localInitializationLVT/runVar.kt @@ -9,4 +9,4 @@ fun test(): Char { } // 1 ASTORE 0 -// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$CharRef; L1 L11 0 \ No newline at end of file +// 1 LOCALVARIABLE c Lkotlin/jvm/internal/Ref\$CharRef; L1 L.* 0 \ No newline at end of file