From 28759a3ac307a9c6741437119783bd754f657abe Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Fri, 9 Dec 2022 14:57:22 +0100
Subject: [PATCH] Optimize rangeUntil operator in for-loops and contains

Newly added tests are basically copies of the existing tests on `until`.
Note that this operator is optimized for all backends, but the fact that
it's optimized is only checked for the JVM backend in bytecode text
tests.

 #KT-53330 Fixed
---
 .../codegen/FirBytecodeTextTestGenerated.java | 70 +++++++++++++++++++
 .../common/lower/RangeContainsLowering.kt     |  1 +
 .../common/lower/loops/ForLoopsLowering.kt    |  2 +-
 .../backend/common/lower/loops/HeaderInfo.kt  |  1 +
 .../lower/loops/handlers/RangeUntilHandler.kt | 39 +++++++++++
 .../forInRangeUntil/forInRangeUntilChar.kt    | 37 ++++++++++
 .../forInRangeUntilCharMaxValue.kt            | 39 +++++++++++
 .../forInRangeUntilCharMinValue.kt            | 38 ++++++++++
 .../forInRangeUntil/forInRangeUntilInt.kt     | 36 ++++++++++
 .../forInRangeUntilIntMaxValue.kt             | 38 ++++++++++
 .../forInRangeUntilIntMinValue.kt             | 41 +++++++++++
 .../forInRangeUntil/forInRangeUntilLong.kt    | 37 ++++++++++
 .../forInRangeUntilLongMaxValue.kt            | 39 +++++++++++
 .../forInRangeUntilLongMinValue.kt            | 38 ++++++++++
 .../bytecodeText/ranges/inRangeUntil.kt       | 16 +++++
 .../codegen/BytecodeTextTestGenerated.java    | 70 +++++++++++++++++++
 .../codegen/IrBytecodeTextTestGenerated.java  | 70 +++++++++++++++++++
 17 files changed, 611 insertions(+), 1 deletion(-)
 create mode 100644 compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/RangeUntilHandler.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt
 create mode 100644 compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt

diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
index bad5caf203f..7c9f2d7c7ed 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBytecodeTextTestGenerated.java
@@ -2772,6 +2772,70 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil")
+        @TestDataPath("$PROJECT_ROOT")
+        public class ForInRangeUntil {
+            @Test
+            public void testAllFilesPresentInForInRangeUntil() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilChar.kt")
+            public void testForInRangeUntilChar() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMaxValue.kt")
+            public void testForInRangeUntilCharMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMinValue.kt")
+            public void testForInRangeUntilCharMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilInt.kt")
+            public void testForInRangeUntilInt() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMaxValue.kt")
+            public void testForInRangeUntilIntMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMinValue.kt")
+            public void testForInRangeUntilIntMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLong.kt")
+            public void testForInRangeUntilLong() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMaxValue.kt")
+            public void testForInRangeUntilLongMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMinValue.kt")
+            public void testForInRangeUntilLongMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeWithUpperBoundMinus1")
         @TestDataPath("$PROJECT_ROOT")
@@ -5224,6 +5288,12 @@ public class FirBytecodeTextTestGenerated extends AbstractFirBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/ranges/inOptimizableUnsignedRange.kt");
         }
 
+        @Test
+        @TestMetadata("inRangeUntil.kt")
+        public void testInRangeUntil() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt");
+        }
+
         @Test
         @TestMetadata("inUntil.kt")
         public void testInUntil() throws Exception {
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/RangeContainsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/RangeContainsLowering.kt
index b9335a05730..eb57086c52c 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/RangeContainsLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/RangeContainsLowering.kt
@@ -393,6 +393,7 @@ internal open class RangeHeaderInfoBuilder(context: CommonBackendContext, scopeO
         ArrayIndicesHandler(context),
         CharSequenceIndicesHandler(context),
         UntilHandler(context),
+        RangeUntilHandler(context),
         DownToHandler(context),
         RangeToHandler(context)
     )
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ForLoopsLowering.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ForLoopsLowering.kt
index 3e1924c9079..14beece0beb 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ForLoopsLowering.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/ForLoopsLowering.kt
@@ -79,7 +79,7 @@ val forLoopsPhase = makeIrFilePhase(
  *       } while (loopVar != last)
  *   }
  * ```
- * If loop is an until loop (e.g., `for (i in A until B)`), it is transformed into:
+ * If loop is an until loop (e.g., `for (i in A until B)` or `for (i in A..<B)`, it is transformed into:
  * ```
  *   var inductionVar = A
  *   val last = B - 1
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderInfo.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderInfo.kt
index 6a5c6fc0dba..cc57cf625f1 100644
--- a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderInfo.kt
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/HeaderInfo.kt
@@ -266,6 +266,7 @@ internal abstract class HeaderInfoBuilder(
         ArrayIndicesHandler(context),
         CharSequenceIndicesHandler(context),
         UntilHandler(context),
+        RangeUntilHandler(context),
         DownToHandler(context),
         RangeToHandler(context),
         StepHandler(context, this)
diff --git a/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/RangeUntilHandler.kt b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/RangeUntilHandler.kt
new file mode 100644
index 00000000000..32fdcc8d15c
--- /dev/null
+++ b/compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/loops/handlers/RangeUntilHandler.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.backend.common.lower.loops.handlers
+
+import org.jetbrains.kotlin.backend.common.CommonBackendContext
+import org.jetbrains.kotlin.backend.common.lower.createIrBuilder
+import org.jetbrains.kotlin.backend.common.lower.loops.*
+import org.jetbrains.kotlin.ir.builders.irInt
+import org.jetbrains.kotlin.ir.expressions.IrCall
+import org.jetbrains.kotlin.ir.symbols.IrSymbol
+
+/** Builds a [HeaderInfo] for progressions built using the `rangeUntil` member function (`..<` operator). */
+internal class RangeUntilHandler(private val context: CommonBackendContext) : HeaderInfoHandler<IrCall, ProgressionType> {
+    private val progressionElementTypes = context.ir.symbols.progressionElementTypes
+
+    override fun matchIterable(expression: IrCall): Boolean {
+        val callee = expression.symbol.owner
+        return callee.valueParameters.singleOrNull()?.type in progressionElementTypes &&
+                callee.extensionReceiverParameter == null &&
+                callee.dispatchReceiverParameter?.type in progressionElementTypes &&
+                callee.name.asString() == "rangeUntil"
+    }
+
+    override fun build(expression: IrCall, data: ProgressionType, scopeOwner: IrSymbol): HeaderInfo =
+        with(context.createIrBuilder(scopeOwner, expression.startOffset, expression.endOffset)) {
+            ProgressionHeaderInfo(
+                data,
+                first = expression.dispatchReceiver!!,
+                last = expression.getValueArgument(0)!!,
+                step = irInt(1),
+                canOverflow = false,
+                isLastInclusive = false,
+                direction = ProgressionDirection.INCREASING
+            )
+        }
+}
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt
new file mode 100644
index 00000000000..76e1ed3db43
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt
@@ -0,0 +1,37 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+fun test(a: Char, b: Char): String {
+    var s = ""
+    for (i in a..<b) {
+        s += i
+    }
+    return s
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IF_ICMPGE
+// 0 IF_ICMPLT
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 5 ILOAD
+// 2 ISTORE
+// 1 IADD
+// 0 ISUB
+// 0 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt
new file mode 100644
index 00000000000..afa1655ccff
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt
@@ -0,0 +1,39 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Char.MAX_VALUE
+
+fun f(a: Char): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IF_ICMPGE
+// 0 IF_ICMPLT
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 4 ILOAD
+// 3 ISTORE
+// 1 IADD
+// 0 ISUB
+// 1 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt
new file mode 100644
index 00000000000..041db16a5a5
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt
@@ -0,0 +1,38 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Char.MIN_VALUE
+
+fun f(a: Char): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IFGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 4 ILOAD
+// 3 ISTORE
+// 1 IADD
+// 0 ISUB
+// 1 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt
new file mode 100644
index 00000000000..55d8e7ec3f7
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt
@@ -0,0 +1,36 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+fun test(a: Int, b: Int): Int {
+    var sum = 0
+    for (i in a..<b) {
+        sum = sum * 10 + i
+    }
+    return sum
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IF_ICMPGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 6 ILOAD
+// 3 ISTORE
+// 1 IADD
+// 0 ISUB
+// 1 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt
new file mode 100644
index 00000000000..aa1edc336ac
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt
@@ -0,0 +1,38 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Int.MAX_VALUE
+
+fun f(a: Int): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IF_ICMPGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 3 ILOAD
+// 2 ISTORE
+// 0 IADD
+// 0 ISUB
+// 2 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt
new file mode 100644
index 00000000000..8f51e24dccf
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt
@@ -0,0 +1,41 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Int.MIN_VALUE
+
+fun f(a: Int): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// JVM non-IR uses while.
+// JVM IR uses if + do-while.
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IF_ICMPGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 3 ILOAD
+// 2 ISTORE
+// 0 IADD
+// 0 ISUB
+// 2 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt
new file mode 100644
index 00000000000..212e8e24daa
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt
@@ -0,0 +1,37 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+fun test(a: Long, b: Long): Long {
+    var sum = 0L
+    for (i in a..<b) {
+        sum = sum * 10L + i
+    }
+    return sum
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 LCMP
+// 1 IFGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 0 ILOAD
+// 0 ISTORE
+// 0 IADD
+// 0 ISUB
+// 0 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt
new file mode 100644
index 00000000000..0e534e42395
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt
@@ -0,0 +1,39 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Long.MAX_VALUE
+
+fun f(a: Long): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 LCMP
+// 1 IFGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 1 ILOAD
+// 1 ISTORE
+// 0 IADD
+// 0 ISUB
+// 1 IINC
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt
new file mode 100644
index 00000000000..27e04711070
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt
@@ -0,0 +1,38 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+// IMPORTANT!
+// Please, when your changes cause failures in bytecodeText tests for 'for' loops,
+// examine the resulting bytecode shape carefully.
+// Range and progression-based loops generated with Kotlin compiler should be
+// as close as possible to Java counter loops ('for (int i = a; i < b; ++i) { ... }').
+// Otherwise it may result in performance regression due to missing HotSpot optimizations.
+// Run Kotlin compiler benchmarks (https://github.com/Kotlin/kotlin-benchmarks)
+// with compiler built from your changes if you are not sure.
+
+const val M = Long.MIN_VALUE
+
+fun f(a: Long): Int {
+    var n = 0
+    for (i in a..<M) {
+        n++
+    }
+    return n
+}
+
+// 0 iterator
+// 0 getStart
+// 0 getEnd
+// 0 getFirst
+// 0 getLast
+// 0 getStep
+
+// 1 IFGE
+// 1 IF
+
+// JVM_IR_TEMPLATES
+// 1 ILOAD
+// 1 ISTORE
+// 0 IADD
+// 0 ISUB
+// 1 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt b/compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt
new file mode 100644
index 00000000000..ff3dbfb2723
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt
@@ -0,0 +1,16 @@
+// !OPT_IN: kotlin.ExperimentalStdlibApi
+// IGNORE_BACKEND: JVM
+
+fun testChar(a: Char, x: Char, y: Char) = a in x..<y
+
+fun testByte(a: Byte, x: Byte, y: Byte) = a in x..<y
+
+fun testShort(a: Short, x: Short, y: Short) = a in x..<y
+
+fun testInt(a: Int, x: Int, y: Int) = a in x..<y
+
+fun testLong(a: Long, x: Long, y: Long) = a in x..<y
+
+// 0 until
+// 0 INVOKEVIRTUAL
+// 0 contains
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
index 0b23a6b9ae8..17320819101 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
@@ -2706,6 +2706,70 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil")
+        @TestDataPath("$PROJECT_ROOT")
+        public class ForInRangeUntil {
+            @Test
+            public void testAllFilesPresentInForInRangeUntil() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilChar.kt")
+            public void testForInRangeUntilChar() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMaxValue.kt")
+            public void testForInRangeUntilCharMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMinValue.kt")
+            public void testForInRangeUntilCharMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilInt.kt")
+            public void testForInRangeUntilInt() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMaxValue.kt")
+            public void testForInRangeUntilIntMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMinValue.kt")
+            public void testForInRangeUntilIntMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLong.kt")
+            public void testForInRangeUntilLong() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMaxValue.kt")
+            public void testForInRangeUntilLongMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMinValue.kt")
+            public void testForInRangeUntilLongMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeWithUpperBoundMinus1")
         @TestDataPath("$PROJECT_ROOT")
@@ -4888,6 +4952,12 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/ranges/inOptimizableUnsignedRange.kt");
         }
 
+        @Test
+        @TestMetadata("inRangeUntil.kt")
+        public void testInRangeUntil() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt");
+        }
+
         @Test
         @TestMetadata("inUntil.kt")
         public void testInUntil() throws Exception {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
index a00a35e569b..eccf90c3229 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
@@ -2772,6 +2772,70 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             }
         }
 
+        @Nested
+        @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil")
+        @TestDataPath("$PROJECT_ROOT")
+        public class ForInRangeUntil {
+            @Test
+            public void testAllFilesPresentInForInRangeUntil() throws Exception {
+                KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilChar.kt")
+            public void testForInRangeUntilChar() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilChar.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMaxValue.kt")
+            public void testForInRangeUntilCharMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilCharMinValue.kt")
+            public void testForInRangeUntilCharMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilCharMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilInt.kt")
+            public void testForInRangeUntilInt() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilInt.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMaxValue.kt")
+            public void testForInRangeUntilIntMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilIntMinValue.kt")
+            public void testForInRangeUntilIntMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilIntMinValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLong.kt")
+            public void testForInRangeUntilLong() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLong.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMaxValue.kt")
+            public void testForInRangeUntilLongMaxValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMaxValue.kt");
+            }
+
+            @Test
+            @TestMetadata("forInRangeUntilLongMinValue.kt")
+            public void testForInRangeUntilLongMinValue() throws Exception {
+                runTest("compiler/testData/codegen/bytecodeText/forLoop/forInRangeUntil/forInRangeUntilLongMinValue.kt");
+            }
+        }
+
         @Nested
         @TestMetadata("compiler/testData/codegen/bytecodeText/forLoop/forInRangeWithUpperBoundMinus1")
         @TestDataPath("$PROJECT_ROOT")
@@ -5224,6 +5288,12 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/ranges/inOptimizableUnsignedRange.kt");
         }
 
+        @Test
+        @TestMetadata("inRangeUntil.kt")
+        public void testInRangeUntil() throws Exception {
+            runTest("compiler/testData/codegen/bytecodeText/ranges/inRangeUntil.kt");
+        }
+
         @Test
         @TestMetadata("inUntil.kt")
         public void testInUntil() throws Exception {