Minor: AbstractForInRangeWithGivenBoundsLoopGenerator

compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/AbstractForInExclusiveRangeLoopGenerator.kt

@@ -25,15 +25,7 @@ import org.jetbrains.org.objectweb.asm.Type
 abstract class AbstractForInExclusiveRangeLoopGenerator(
         codegen: ExpressionCodegen,
         forExpression: KtForExpression
-) : AbstractForInRangeLoopGenerator(codegen, forExpression) {
+) : AbstractForInRangeWithGivenBoundsLoopGenerator(codegen, forExpression) {
-    protected abstract fun generateFrom(): StackValue
-    protected abstract fun generateTo(): StackValue
-
-    override fun storeRangeStartAndEnd() {
-        loopParameter().store(generateFrom(), v)
-        StackValue.local(endVar, asmElementType).store(generateTo(), v)
-    }
-
     override fun checkEmptyLoop(loopExit: Label) {}
 
     override fun checkPreCondition(loopExit: Label) {

compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/AbstractForInRangeWithGivenBoundsLoopGenerator.kt

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.codegen.forLoop
+
+import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
+import org.jetbrains.kotlin.psi.KtForExpression
+
+abstract class AbstractForInRangeWithGivenBoundsLoopGenerator(
+        codegen: ExpressionCodegen,
+        forExpression: KtForExpression,
+        step: Int = 1
+) : AbstractForInRangeLoopGenerator(codegen, forExpression, step) {
+    protected abstract fun generateFrom(): StackValue
+    protected abstract fun generateTo(): StackValue
+
+    override fun storeRangeStartAndEnd() {
+        loopParameter().store(generateFrom(), v)
+        StackValue.local(endVar, asmElementType).store(generateTo(), v)
+    }
+}

compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/ForInDownToProgressionLoopGenerator.kt

@@ -27,12 +27,11 @@ class ForInDownToProgressionLoopGenerator(
         codegen: ExpressionCodegen,
         forExpression: KtForExpression,
         loopRangeCall: ResolvedCall<*>
-) : AbstractForInRangeLoopGenerator(codegen, forExpression, -1) {
+) : AbstractForInRangeWithGivenBoundsLoopGenerator(codegen, forExpression, -1) {
     private val from: ReceiverValue = loopRangeCall.extensionReceiver!!
     private val to: KtExpression = ExpressionCodegen.getSingleArgumentExpression(loopRangeCall)!!
 
-    override fun storeRangeStartAndEnd() {
+    override fun generateFrom(): StackValue = codegen.generateReceiverValue(from, false)
-        loopParameter().store(codegen.generateReceiverValue(from, false), v)
+
-        StackValue.local(endVar, asmElementType).store(codegen.gen(to), v)
+    override fun generateTo(): StackValue = codegen.gen(to)
-    }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/ForInRangeInstanceLoopGenerator.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.codegen.forLoop
 
 import org.jetbrains.kotlin.codegen.ExpressionCodegen
+import org.jetbrains.kotlin.codegen.StackValue
 import org.jetbrains.kotlin.psi.KtForExpression
 
 class ForInRangeInstanceLoopGenerator(
@@ -31,8 +32,7 @@ class ForInRangeInstanceLoopGenerator(
         v.dup()
 
         // ranges inherit first and last from corresponding progressions
-        generateRangeOrProgressionProperty(asmLoopRangeType, "getFirst", asmElementType, loopParameterType,
+        generateRangeOrProgressionProperty(asmLoopRangeType, "getFirst", asmElementType, loopParameterType, loopParameterVar)
-                                           loopParameterVar)
         generateRangeOrProgressionProperty(asmLoopRangeType, "getLast", asmElementType, asmElementType, endVar)
     }
 }

compiler/backend/src/org/jetbrains/kotlin/codegen/forLoop/ForInRangeLiteralLoopGenerator.kt

@@ -27,12 +27,16 @@ class ForInRangeLiteralLoopGenerator(
         codegen: ExpressionCodegen,
         forExpression: KtForExpression,
         loopRangeCall: ResolvedCall<*>
-) : AbstractForInRangeLoopGenerator(codegen, forExpression) {
+) : AbstractForInRangeWithGivenBoundsLoopGenerator(codegen, forExpression) {
     private val from: ReceiverValue = loopRangeCall.dispatchReceiver!!
     private val to: KtExpression = ExpressionCodegen.getSingleArgumentExpression(loopRangeCall)!!
 
+    override fun generateFrom(): StackValue = codegen.generateReceiverValue(from, false)
+
+    override fun generateTo(): StackValue = codegen.gen(to)
+
     override fun storeRangeStartAndEnd() {
-        loopParameter().store(codegen.generateReceiverValue(from, false), codegen.v)
+        loopParameter().store(generateFrom(), v)
-        StackValue.local(endVar, asmElementType).store(codegen.gen(to), codegen.v)
+        StackValue.local(endVar, asmElementType).store(generateTo(), v)
     }
 }