diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index c91052fe5c2..fe3f256e114 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -765,13 +765,6 @@ public class ExpressionCodegen extends KtVisitor impleme v.invokevirtual(loopRangeType.getInternalName(), getterName, "()" + elementType.getDescriptor(), false); v.store(varToStore, elementType); } - - protected void generateRangeOrProgressionBoxedProperty(Type loopRangeType, String getterName, Type elementType, int varToStore) { - Type boxedType = boxType(elementType); - v.invokevirtual(loopRangeType.getInternalName(), getterName, "()" + boxedType.getDescriptor(), false); - StackValue.coerce(boxedType, elementType, v); - v.store(varToStore, elementType); - } } private void generateLoopBody(@Nullable KtExpression body) { @@ -1084,7 +1077,7 @@ public class ExpressionCodegen extends KtVisitor impleme generateRangeOrProgressionProperty(asmLoopRangeType, "getFirst", asmElementType, loopParameterVar); generateRangeOrProgressionProperty(asmLoopRangeType, "getLast", asmElementType, endVar); - generateRangeOrProgressionBoxedProperty(asmLoopRangeType, "getIncrement", incrementType, incrementVar); + generateRangeOrProgressionProperty(asmLoopRangeType, "getStep", incrementType, incrementVar); } @Override diff --git a/compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt b/compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt index fc45b598102..ce1a5240614 100644 --- a/compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt +++ b/compiler/testData/codegen/bytecodeText/forLoop/primitiveProgression.kt @@ -8,4 +8,4 @@ fun f() { // 0 iterator // 2 getFirst // 2 getLast -// 2 getIncrement \ No newline at end of file +// 2 getStep \ No newline at end of file