KT-42909 fix missing loop variable in 'withIndex' ranges

JetBrains · Nov 23, 2020 · bf7fdcd · bf7fdcd
1 parent a9c9406
commit bf7fdcd
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 6 deletions.
diff --git a/...ler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java b/...ler/fir/fir2ir/tests/org/jetbrains/kotlin/codegen/ir/FirBlackBoxCodegenTestGenerated.java
diff --git a/.../ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt b/.../ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderProcessor.kt
@@ -297,7 +297,7 @@ internal class ProgressionLoopHeader(
 
             // loopVariable = inductionVariable
             // inductionVariable = inductionVariable + step
-            listOfNotNull(loopVariable, incrementInductionVariable(this))
+            listOfNotNull(this@ProgressionLoopHeader.loopVariable, incrementInductionVariable(this))
         }
 
     override fun buildLoop(builder: DeclarationIrBuilder, oldLoop: IrLoop, newBody: IrExpression?) =
@@ -552,11 +552,8 @@ internal class WithIndexLoopHeader(
             //
             // We "wire" the 1st destructured component to index, and the 2nd to the loop variable value from the underlying iterable.
             loopVariableComponents[1]?.initializer = irGet(indexVariable)
-            listOfNotNull(loopVariableComponents[1], incrementIndexStatement) + nestedLoopHeader.initializeIteration(
-                loopVariableComponents[2],
-                linkedMapOf(),
-                builder
-            )
+            listOfNotNull(loopVariableComponents[1], incrementIndexStatement) +
+                    nestedLoopHeader.initializeIteration(loopVariableComponents[2], linkedMapOf(), builder)
         }
 
     // Use the nested loop header to build the loop. More info in comments in initializeIteration().

diff --git a/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/kt42909.kt b/compiler/testData/codegen/box/ranges/forInProgressionWithIndex/kt42909.kt
@@ -0,0 +1,16 @@
+// WITH_RUNTIME
+// KJS_WITH_FULL_RUNTIME
+
+fun box(): String {
+    var r = test()
+    if (r != "01") throw AssertionError(r.toString())
+    return "OK"
+}
+
+private fun test(): String {
+    var r = ""
+    for ((i, _) in (1..'c' - 'a').withIndex()) {
+        r += i.toString()
+    }
+    return r
+}
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ir/IrBlackBoxCodegenTestGenerated.java
diff --git a/...tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java b/...tests/test/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java
diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java
diff --git a/...tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java b/...tests/test/org/jetbrains/kotlin/js/test/wasm/semantics/IrCodegenBoxWasmTestGenerated.java