Update range iteration tests and regenerate test data.

compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyDownto.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 5 downTo 10: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 5.toByte() downTo 10.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for 5.toByte() downTo 10.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 5.toShort() downTo 10.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for 5.toShort() downTo 10.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/emptyRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 10..5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 10.toByte()..(-5).toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for 10.toByte()..(-5).toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 10.toShort()..(-5).toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for 10.toShort()..(-5).toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (MinB + 5).toByte() downTo MinB step 3
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MinB + 5).toByte(), (MinB + 2).toByte())) {
+    if (list2 != listOf<Int>((MinB + 5).toInt(), (MinB + 2).toInt())) {
         return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (MinS + 5).toShort() downTo MinS step 3
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MinS + 5).toShort(), (MinS + 2).toShort())) {
+    if (list3 != listOf<Int>((MinS + 5).toInt(), (MinS + 2).toInt())) {
         return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedDownTo.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 8 downTo 3 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 8.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(8, 6, 4)) {
+    if (list2 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toByte() downTo 3.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 8.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(8, 6, 4)) {
+    if (list3 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toShort() downTo 3.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactSteppedRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 3..8 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 3.toByte()..8.toByte() step 2
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7)) {
+    if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toByte()..8.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 3.toShort()..8.toShort() step 2
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7)) {
+    if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toShort()..8.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (MaxB - 5).toByte()..MaxB step 3
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 5).toByte(), (MaxB - 2).toByte())) {
+    if (list2 != listOf<Int>((MaxB - 5).toInt(), (MaxB - 2).toInt())) {
         return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (MaxS - 5).toShort()..MaxS step 3
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 5).toShort(), (MaxS - 2).toShort())) {
+    if (list3 != listOf<Int>((MaxS - 5).toInt(), (MaxS - 2).toInt())) {
         return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueMinusTwoToMaxValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for (MaxI - 2)..MaxI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (MaxB - 2).toByte()..MaxB
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 2).toByte(), (MaxB - 1).toByte(), MaxB)) {
+    if (list2 != listOf<Int>((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (MaxS - 2).toShort()..MaxS
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 2).toShort(), (MaxS - 1).toShort(), MaxS)) {
+    if (list3 != listOf<Int>((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMaxValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for MaxI..MaxI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = MaxB..MaxB
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MaxB)) {
+    if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = MaxS..MaxS
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MaxS)) {
+    if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/maxValueToMinValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for MaxI..MinI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = MaxB..MinB
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = MaxS..MinS
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementDownTo.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 5 downTo 5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 5.toByte() downTo 5.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5.toByte())) {
+    if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte() downTo 5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 5.toShort() downTo 5.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5.toShort())) {
+    if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort() downTo 5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/oneElementRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 5..5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 5.toByte()..5.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5.toByte())) {
+    if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte()..5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 5.toShort()..5.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5.toShort())) {
+    if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort()..5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/openRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 1 until 5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 1.toByte() until 5.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(1, 2, 3, 4)) {
+    if (list2 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toByte() until 5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 1.toShort() until 5.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(1, 2, 3, 4)) {
+    if (list3 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toShort() until 5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (MinB + 2).toByte() downTo MinB step 1
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MinB + 2).toByte(), (MinB + 1).toByte(), MinB)) {
+    if (list2 != listOf<Int>((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt())) {
         return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (MinS + 2).toShort() downTo MinS step 1
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MinS + 2).toShort(), (MinS + 1).toShort(), MinS)) {
+    if (list3 != listOf<Int>((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt())) {
         return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (MaxB - 2).toByte()..MaxB step 2
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 2).toByte(), MaxB)) {
+    if (list2 != listOf<Int>((MaxB - 2).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (MaxS - 2).toShort()..MaxS step 2
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 2).toShort(), MaxS)) {
+    if (list3 != listOf<Int>((MaxS - 2).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for MaxI..MaxI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = MaxB..MaxB step 1
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MaxB)) {
+    if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = MaxS..MaxS step 1
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MaxS)) {
+    if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for MaxI..MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = MaxB..MinB step 1
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = MaxS..MinS step 1
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt

@@ -23,23 +23,23 @@ fun box(): String {
         return "Wrong elements for MinI..MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = MinB..MinB step 1
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MinB)) {
+    if (list2 != listOf<Int>(MinB.toInt())) {
         return "Wrong elements for MinB..MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = MinS..MinS step 1
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MinS)) {
+    if (list3 != listOf<Int>(MinS.toInt())) {
         return "Wrong elements for MinS..MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedBackSequence.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (5 downTo 3).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (5.toByte() downTo 3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5)) {
+    if (list2 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toByte() downTo 3.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (5.toShort() downTo 3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5)) {
+    if (list3 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toShort() downTo 3.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyBackSequence.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (3 downTo 5).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (3.toByte() downTo 5.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for (3.toByte() downTo 5.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (3.toShort() downTo 5.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for (3.toShort() downTo 5.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedEmptyRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (5..3).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (5.toByte()..3.toByte()).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for (5.toByte()..3.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (5.toShort()..3.toShort()).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for (5.toShort()..3.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedInexactSteppedDownTo.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (8 downTo 3 step 2).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (8.toByte() downTo 3.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7)) {
+    if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for (8.toByte() downTo 3.toByte() step 2).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (8.toShort() downTo 3.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7)) {
+    if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for (8.toShort() downTo 3.toShort() step 2).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedRange.kt

@@ -12,64 +12,54 @@ fun box(): String {
         return "Wrong elements for (3..5).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
-    val range2 = (3.toByte()..5.toByte()).reversed()
+    val range2 = (3.toShort()..5.toShort()).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5, 4, 3)) {
+    if (list2 != listOf<Int>(5, 4, 3)) {
-        return "Wrong elements for (3.toByte()..5.toByte()).reversed(): $list2"
+        return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Long>()
-    val range3 = (3.toShort()..5.toShort()).reversed()
+    val range3 = (3.toLong()..5.toLong()).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5, 4, 3)) {
+    if (list3 != listOf<Long>(5, 4, 3)) {
-        return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list3"
+        return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list3"
     }
 
-    val list4 = ArrayList<Long>()
+    val list4 = ArrayList<Char>()
-    val range4 = (3.toLong()..5.toLong()).reversed()
+    val range4 = ('a'..'c').reversed()
     for (i in range4) {
         list4.add(i)
         if (list4.size() > 23) break
     }
-    if (list4 != listOf<Long>(5, 4, 3)) {
+    if (list4 != listOf<Char>('c', 'b', 'a')) {
-        return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list4"
+        return "Wrong elements for ('a'..'c').reversed(): $list4"
     }
 
-    val list5 = ArrayList<Char>()
+    val list5 = ArrayList<Double>()
-    val range5 = ('a'..'c').reversed()
+    val range5 = (3.0..5.0).reversed()
     for (i in range5) {
         list5.add(i)
         if (list5.size() > 23) break
     }
-    if (list5 != listOf<Char>('c', 'b', 'a')) {
+    if (list5 != listOf<Double>(5.0, 4.0, 3.0)) {
-        return "Wrong elements for ('a'..'c').reversed(): $list5"
+        return "Wrong elements for (3.0..5.0).reversed(): $list5"
     }
 
-    val list6 = ArrayList<Double>()
+    val list6 = ArrayList<Float>()
-    val range6 = (3.0..5.0).reversed()
+    val range6 = (3.0.toFloat()..5.0.toFloat()).reversed()
     for (i in range6) {
         list6.add(i)
         if (list6.size() > 23) break
     }
-    if (list6 != listOf<Double>(5.0, 4.0, 3.0)) {
+    if (list6 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
-        return "Wrong elements for (3.0..5.0).reversed(): $list6"
+        return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list6"
-    }
-
-    val list7 = ArrayList<Float>()
-    val range7 = (3.0.toFloat()..5.0.toFloat()).reversed()
-    for (i in range7) {
-        list7.add(i)
-        if (list7.size() > 23) break
-    }
-    if (list7 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
-        return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list7"
     }
 
     return "OK"

compiler/testData/codegen/boxWithStdlib/ranges/expression/reversedSimpleSteppedRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (3..9 step 2).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (3.toByte()..9.toByte() step 2).reversed()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 7, 5, 3)) {
+    if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toByte()..9.toByte() step 2).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (3.toShort()..9.toShort() step 2).reversed()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 7, 5, 3)) {
+    if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toShort()..9.toShort() step 2).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleDownTo.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 9 downTo 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 9.toByte() downTo 3.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 8, 7, 6, 5, 4, 3)) {
+    if (list2 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 9.toShort() downTo 3.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 8, 7, 6, 5, 4, 3)) {
+    if (list3 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 3..9: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 3.toByte()..9.toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 3.toShort()..9.toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleRangeWithNonConstantEnds.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for (1 + 2)..(10 - 1): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte()
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort()
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedDownTo.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 9 downTo 3 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 9.toByte() downTo 3.toByte() step 2
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 7, 5, 3)) {
+    if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 9.toShort() downTo 3.toShort() step 2
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 7, 5, 3)) {
+    if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/expression/simpleSteppedRange.kt

@@ -12,23 +12,23 @@ fun box(): String {
         return "Wrong elements for 3..9 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     val range2 = 3.toByte()..9.toByte() step 2
     for (i in range2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7, 9)) {
+    if (list2 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     val range3 = 3.toShort()..9.toShort() step 2
     for (i in range3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7, 9)) {
+    if (list3 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyDownto.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 5 downTo 10: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 5.toByte() downTo 10.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for 5.toByte() downTo 10.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 5.toShort() downTo 10.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for 5.toShort() downTo 10.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/emptyRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 10..5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 10.toByte()..(-5).toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for 10.toByte()..(-5).toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 10.toShort()..(-5).toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for 10.toShort()..(-5).toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactDownToMinValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (MinB + 5).toByte() downTo MinB step 3) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MinB + 5).toByte(), (MinB + 2).toByte())) {
+    if (list2 != listOf<Int>((MinB + 5).toInt(), (MinB + 2).toInt())) {
         return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (MinS + 5).toShort() downTo MinS step 3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MinS + 5).toShort(), (MinS + 2).toShort())) {
+    if (list3 != listOf<Int>((MinS + 5).toInt(), (MinS + 2).toInt())) {
         return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedDownTo.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 8 downTo 3 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 8.toByte() downTo 3.toByte() step 2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(8, 6, 4)) {
+    if (list2 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toByte() downTo 3.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 8.toShort() downTo 3.toShort() step 2) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(8, 6, 4)) {
+    if (list3 != listOf<Int>(8, 6, 4)) {
         return "Wrong elements for 8.toShort() downTo 3.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactSteppedRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 3..8 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 3.toByte()..8.toByte() step 2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7)) {
+    if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toByte()..8.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 3.toShort()..8.toShort() step 2) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7)) {
+    if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for 3.toShort()..8.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/inexactToMaxValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (MaxB - 5).toByte()..MaxB step 3) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 5).toByte(), (MaxB - 2).toByte())) {
+    if (list2 != listOf<Int>((MaxB - 5).toInt(), (MaxB - 2).toInt())) {
         return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (MaxS - 5).toShort()..MaxS step 3) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 5).toShort(), (MaxS - 2).toShort())) {
+    if (list3 != listOf<Int>((MaxS - 5).toInt(), (MaxS - 2).toInt())) {
         return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueMinusTwoToMaxValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for (MaxI - 2)..MaxI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (MaxB - 2).toByte()..MaxB) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 2).toByte(), (MaxB - 1).toByte(), MaxB)) {
+    if (list2 != listOf<Int>((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (MaxS - 2).toShort()..MaxS) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 2).toShort(), (MaxS - 1).toShort(), MaxS)) {
+    if (list3 != listOf<Int>((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMaxValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for MaxI..MaxI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in MaxB..MaxB) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MaxB)) {
+    if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in MaxS..MaxS) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MaxS)) {
+    if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/maxValueToMinValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for MaxI..MinI: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in MaxB..MinB) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in MaxS..MinS) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementDownTo.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 5 downTo 5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 5.toByte() downTo 5.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5.toByte())) {
+    if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte() downTo 5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 5.toShort() downTo 5.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5.toShort())) {
+    if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort() downTo 5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/oneElementRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 5..5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 5.toByte()..5.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5.toByte())) {
+    if (list2 != listOf<Int>(5)) {
         return "Wrong elements for 5.toByte()..5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 5.toShort()..5.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5.toShort())) {
+    if (list3 != listOf<Int>(5)) {
         return "Wrong elements for 5.toShort()..5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/openRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 1 until 5: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 1.toByte() until 5.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(1, 2, 3, 4)) {
+    if (list2 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toByte() until 5.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 1.toShort() until 5.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(1, 2, 3, 4)) {
+    if (list3 != listOf<Int>(1, 2, 3, 4)) {
         return "Wrong elements for 1.toShort() until 5.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionDownToMinValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (MinB + 2).toByte() downTo MinB step 1) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MinB + 2).toByte(), (MinB + 1).toByte(), MinB)) {
+    if (list2 != listOf<Int>((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt())) {
         return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (MinS + 2).toShort() downTo MinS step 1) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MinS + 2).toShort(), (MinS + 1).toShort(), MinS)) {
+    if (list3 != listOf<Int>((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt())) {
         return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueMinusTwoToMaxValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (MaxB - 2).toByte()..MaxB step 2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>((MaxB - 2).toByte(), MaxB)) {
+    if (list2 != listOf<Int>((MaxB - 2).toInt(), MaxB.toInt())) {
         return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (MaxS - 2).toShort()..MaxS step 2) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>((MaxS - 2).toShort(), MaxS)) {
+    if (list3 != listOf<Int>((MaxS - 2).toInt(), MaxS.toInt())) {
         return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMaxValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for MaxI..MaxI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in MaxB..MaxB step 1) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MaxB)) {
+    if (list2 != listOf<Int>(MaxB.toInt())) {
         return "Wrong elements for MaxB..MaxB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in MaxS..MaxS step 1) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MaxS)) {
+    if (list3 != listOf<Int>(MaxS.toInt())) {
         return "Wrong elements for MaxS..MaxS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMaxValueToMinValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for MaxI..MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in MaxB..MinB step 1) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for MaxB..MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in MaxS..MinS step 1) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for MaxS..MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/progressionMinValueToMinValue.kt

@@ -22,21 +22,21 @@ fun box(): String {
         return "Wrong elements for MinI..MinI step 1: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in MinB..MinB step 1) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(MinB)) {
+    if (list2 != listOf<Int>(MinB.toInt())) {
         return "Wrong elements for MinB..MinB step 1: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in MinS..MinS step 1) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(MinS)) {
+    if (list3 != listOf<Int>(MinS.toInt())) {
         return "Wrong elements for MinS..MinS step 1: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedBackSequence.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (5 downTo 3).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (5.toByte() downTo 3.toByte()).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5)) {
+    if (list2 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toByte() downTo 3.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (5.toShort() downTo 3.toShort()).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5)) {
+    if (list3 != listOf<Int>(3, 4, 5)) {
         return "Wrong elements for (5.toShort() downTo 3.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyBackSequence.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (3 downTo 5).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (3.toByte() downTo 5.toByte()).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for (3.toByte() downTo 5.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (3.toShort() downTo 5.toShort()).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for (3.toShort() downTo 5.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedEmptyRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (5..3).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (5.toByte()..3.toByte()).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>()) {
+    if (list2 != listOf<Int>()) {
         return "Wrong elements for (5.toByte()..3.toByte()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (5.toShort()..3.toShort()).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>()) {
+    if (list3 != listOf<Int>()) {
         return "Wrong elements for (5.toShort()..3.toShort()).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedInexactSteppedDownTo.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (8 downTo 3 step 2).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (8.toByte() downTo 3.toByte() step 2).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7)) {
+    if (list2 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for (8.toByte() downTo 3.toByte() step 2).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (8.toShort() downTo 3.toShort() step 2).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7)) {
+    if (list3 != listOf<Int>(3, 5, 7)) {
         return "Wrong elements for (8.toShort() downTo 3.toShort() step 2).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedRange.kt

@@ -11,58 +11,49 @@ fun box(): String {
         return "Wrong elements for (3..5).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
-    for (i in (3.toByte()..5.toByte()).reversed()) {
+    for (i in (3.toShort()..5.toShort()).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(5, 4, 3)) {
+    if (list2 != listOf<Int>(5, 4, 3)) {
-        return "Wrong elements for (3.toByte()..5.toByte()).reversed(): $list2"
+        return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Long>()
-    for (i in (3.toShort()..5.toShort()).reversed()) {
+    for (i in (3.toLong()..5.toLong()).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(5, 4, 3)) {
+    if (list3 != listOf<Long>(5, 4, 3)) {
-        return "Wrong elements for (3.toShort()..5.toShort()).reversed(): $list3"
+        return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list3"
     }
 
-    val list4 = ArrayList<Long>()
+    val list4 = ArrayList<Char>()
-    for (i in (3.toLong()..5.toLong()).reversed()) {
+    for (i in ('a'..'c').reversed()) {
         list4.add(i)
         if (list4.size() > 23) break
     }
-    if (list4 != listOf<Long>(5, 4, 3)) {
+    if (list4 != listOf<Char>('c', 'b', 'a')) {
-        return "Wrong elements for (3.toLong()..5.toLong()).reversed(): $list4"
+        return "Wrong elements for ('a'..'c').reversed(): $list4"
     }
 
-    val list5 = ArrayList<Char>()
+    val list5 = ArrayList<Double>()
-    for (i in ('a'..'c').reversed()) {
+    for (i in (3.0..5.0).reversed()) {
         list5.add(i)
         if (list5.size() > 23) break
     }
-    if (list5 != listOf<Char>('c', 'b', 'a')) {
+    if (list5 != listOf<Double>(5.0, 4.0, 3.0)) {
-        return "Wrong elements for ('a'..'c').reversed(): $list5"
+        return "Wrong elements for (3.0..5.0).reversed(): $list5"
     }
 
-    val list6 = ArrayList<Double>()
+    val list6 = ArrayList<Float>()
-    for (i in (3.0..5.0).reversed()) {
+    for (i in (3.0.toFloat()..5.0.toFloat()).reversed()) {
         list6.add(i)
         if (list6.size() > 23) break
     }
-    if (list6 != listOf<Double>(5.0, 4.0, 3.0)) {
+    if (list6 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
-        return "Wrong elements for (3.0..5.0).reversed(): $list6"
+        return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list6"
-    }
-
-    val list7 = ArrayList<Float>()
-    for (i in (3.0.toFloat()..5.0.toFloat()).reversed()) {
-        list7.add(i)
-        if (list7.size() > 23) break
-    }
-    if (list7 != listOf<Float>(5.0.toFloat(), 4.0.toFloat(), 3.0.toFloat())) {
-        return "Wrong elements for (3.0.toFloat()..5.0.toFloat()).reversed(): $list7"
     }
 
     return "OK"

compiler/testData/codegen/boxWithStdlib/ranges/literal/reversedSimpleSteppedRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (3..9 step 2).reversed(): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (3.toByte()..9.toByte() step 2).reversed()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 7, 5, 3)) {
+    if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toByte()..9.toByte() step 2).reversed(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (3.toShort()..9.toShort() step 2).reversed()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 7, 5, 3)) {
+    if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for (3.toShort()..9.toShort() step 2).reversed(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleDownTo.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 9 downTo 3: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 9.toByte() downTo 3.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 8, 7, 6, 5, 4, 3)) {
+    if (list2 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 9.toShort() downTo 3.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 8, 7, 6, 5, 4, 3)) {
+    if (list3 != listOf<Int>(9, 8, 7, 6, 5, 4, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 3..9: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 3.toByte()..9.toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 3.toShort()..9.toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleRangeWithNonConstantEnds.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for (1 + 2)..(10 - 1): $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte()) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list2 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(): $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort()) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 4, 5, 6, 7, 8, 9)) {
+    if (list3 != listOf<Int>(3, 4, 5, 6, 7, 8, 9)) {
         return "Wrong elements for (1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(): $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedDownTo.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 9 downTo 3 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 9.toByte() downTo 3.toByte() step 2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(9, 7, 5, 3)) {
+    if (list2 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toByte() downTo 3.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 9.toShort() downTo 3.toShort() step 2) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(9, 7, 5, 3)) {
+    if (list3 != listOf<Int>(9, 7, 5, 3)) {
         return "Wrong elements for 9.toShort() downTo 3.toShort() step 2: $list3"
     }
 

compiler/testData/codegen/boxWithStdlib/ranges/literal/simpleSteppedRange.kt

@@ -11,21 +11,21 @@ fun box(): String {
         return "Wrong elements for 3..9 step 2: $list1"
     }
 
-    val list2 = ArrayList<Byte>()
+    val list2 = ArrayList<Int>()
     for (i in 3.toByte()..9.toByte() step 2) {
         list2.add(i)
         if (list2.size() > 23) break
     }
-    if (list2 != listOf<Byte>(3, 5, 7, 9)) {
+    if (list2 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toByte()..9.toByte() step 2: $list2"
     }
 
-    val list3 = ArrayList<Short>()
+    val list3 = ArrayList<Int>()
     for (i in 3.toShort()..9.toShort() step 2) {
         list3.add(i)
         if (list3.size() > 23) break
     }
-    if (list3 != listOf<Short>(3, 5, 7, 9)) {
+    if (list3 != listOf<Int>(3, 5, 7, 9)) {
         return "Wrong elements for 3.toShort()..9.toShort() step 2: $list3"
     }
 

generators/src/org/jetbrains/kotlin/generators/tests/GenerateRangesCodegenTestData.java

@@ -70,10 +70,6 @@ public class GenerateRangesCodegenTestData {
             .put("\"", "Char")
             .put("Float.NaN", "Float")
             .put("Double.NaN", "Double")
-            .put("MaxB", "Byte")
-            .put("MinB", "Byte")
-            .put("MaxS", "Short")
-            .put("MinS", "Short")
             .put("MaxL", "Long")
             .put("MinL", "Long")
             .put("MaxC", "Char")
@@ -83,7 +79,8 @@ public class GenerateRangesCodegenTestData {
     private static String detectElementType(String rangeExpression) {
         Matcher matcher = Pattern.compile("\\.to(\\w+)").matcher(rangeExpression);
         if (matcher.find()) {
-            return matcher.group(1);
+            String elementType = matcher.group(1);
+            return elementType.equals("Byte") || elementType.equals("Short") ? "Int" : elementType;
         }
         if (Pattern.compile("\\d\\.\\d").matcher(rangeExpression).find()) {
             return "Double";

libraries/stdlib/test/language/RangeIterationJVMTest.kt

@@ -61,8 +61,8 @@ public class RangeIterationJVMTest {
 
     @test fun maxValueToMaxValue() {
         doTest(MaxI..MaxI, MaxI, MaxI, 1, listOf(MaxI))
-        doTest(MaxB..MaxB, MaxB, MaxB, 1, listOf(MaxB))
+        doTest(MaxB..MaxB, MaxB.toInt(), MaxB.toInt(), 1, listOf(MaxB.toInt()))
-        doTest(MaxS..MaxS, MaxS, MaxS, 1, listOf(MaxS))
+        doTest(MaxS..MaxS, MaxS.toInt(), MaxS.toInt(), 1, listOf(MaxS.toInt()))
         doTest(MaxL..MaxL, MaxL, MaxL, 1.toLong(), listOf(MaxL))
 
         doTest(MaxC..MaxC, MaxC, MaxC, 1, listOf(MaxC))
@@ -70,8 +70,8 @@ public class RangeIterationJVMTest {
 
     @test fun maxValueMinusTwoToMaxValue() {
         doTest((MaxI - 2)..MaxI, MaxI - 2, MaxI, 1, listOf(MaxI - 2, MaxI - 1, MaxI))
-        doTest((MaxB - 2).toByte()..MaxB, (MaxB - 2).toByte(), MaxB, 1, listOf((MaxB - 2).toByte(), (MaxB - 1).toByte(), MaxB))
+        doTest((MaxB - 2).toByte()..MaxB, (MaxB - 2).toInt(), MaxB.toInt(), 1, listOf((MaxB - 2).toInt(), (MaxB - 1).toInt(), MaxB.toInt()))
-        doTest((MaxS - 2).toShort()..MaxS, (MaxS - 2).toShort(), MaxS, 1, listOf((MaxS - 2).toShort(), (MaxS - 1).toShort(), MaxS))
+        doTest((MaxS - 2).toShort()..MaxS, (MaxS - 2).toInt(), MaxS.toInt(), 1, listOf((MaxS - 2).toInt(), (MaxS - 1).toInt(), MaxS.toInt()))
         doTest((MaxL - 2).toLong()..MaxL, (MaxL - 2).toLong(), MaxL, 1.toLong(), listOf((MaxL - 2).toLong(), (MaxL - 1).toLong(), MaxL))
 
         doTest((MaxC - 2)..MaxC, (MaxC - 2), MaxC, 1, listOf((MaxC - 2), (MaxC - 1), MaxC))
@@ -79,8 +79,8 @@ public class RangeIterationJVMTest {
 
     @test fun maxValueToMinValue() {
         doTest(MaxI..MinI, MaxI, MinI, 1, listOf())
-        doTest(MaxB..MinB, MaxB, MinB, 1, listOf())
+        doTest(MaxB..MinB, MaxB.toInt(), MinB.toInt(), 1, listOf())
-        doTest(MaxS..MinS, MaxS, MinS, 1, listOf())
+        doTest(MaxS..MinS, MaxS.toInt(), MinS.toInt(), 1, listOf())
         doTest(MaxL..MinL, MaxL, MinL, 1.toLong(), listOf())
 
         doTest(MaxC..MinC, MaxC, MinC, 1, listOf())
@@ -88,8 +88,8 @@ public class RangeIterationJVMTest {
 
     @test fun progressionMaxValueToMaxValue() {
         doTest(MaxI..MaxI step 1, MaxI, MaxI, 1, listOf(MaxI))
-        doTest(MaxB..MaxB step 1, MaxB, MaxB, 1, listOf(MaxB))
+        doTest(MaxB..MaxB step 1, MaxB.toInt(), MaxB.toInt(), 1, listOf(MaxB.toInt()))
-        doTest(MaxS..MaxS step 1, MaxS, MaxS, 1, listOf(MaxS))
+        doTest(MaxS..MaxS step 1, MaxS.toInt(), MaxS.toInt(), 1, listOf(MaxS.toInt()))
         doTest(MaxL..MaxL step 1, MaxL, MaxL, 1.toLong(), listOf(MaxL))
 
         doTest(MaxC..MaxC step 1, MaxC, MaxC, 1, listOf(MaxC))
@@ -97,8 +97,8 @@ public class RangeIterationJVMTest {
 
     @test fun progressionMaxValueMinusTwoToMaxValue() {
         doTest((MaxI - 2)..MaxI step 2, MaxI - 2, MaxI, 2, listOf(MaxI - 2, MaxI))
-        doTest((MaxB - 2).toByte()..MaxB step 2, (MaxB - 2).toByte(), MaxB, 2, listOf((MaxB - 2).toByte(), MaxB))
+        doTest((MaxB - 2).toByte()..MaxB step 2, (MaxB - 2).toInt(), MaxB.toInt(), 2, listOf((MaxB - 2).toInt(), MaxB.toInt()))
-        doTest((MaxS - 2).toShort()..MaxS step 2, (MaxS - 2).toShort(), MaxS, 2, listOf((MaxS - 2).toShort(), MaxS))
+        doTest((MaxS - 2).toShort()..MaxS step 2, (MaxS - 2).toInt(), MaxS.toInt(), 2, listOf((MaxS - 2).toInt(), MaxS.toInt()))
         doTest((MaxL - 2).toLong()..MaxL step 2, (MaxL - 2).toLong(), MaxL, 2.toLong(), listOf((MaxL - 2).toLong(), MaxL))
 
         doTest((MaxC - 2)..MaxC step 2, (MaxC - 2), MaxC, 2, listOf((MaxC - 2), MaxC))
@@ -106,8 +106,8 @@ public class RangeIterationJVMTest {
 
     @test fun progressionMaxValueToMinValue() {
         doTest(MaxI..MinI step 1, MaxI, MinI, 1, listOf())
-        doTest(MaxB..MinB step 1, MaxB, MinB, 1, listOf())
+        doTest(MaxB..MinB step 1, MaxB.toInt(), MinB.toInt(), 1, listOf())
-        doTest(MaxS..MinS step 1, MaxS, MinS, 1, listOf())
+        doTest(MaxS..MinS step 1, MaxS.toInt(), MinS.toInt(), 1, listOf())
         doTest(MaxL..MinL step 1, MaxL, MinL, 1.toLong(), listOf())
 
         doTest(MaxC..MinC step 1, MaxC, MinC, 1, listOf())
@@ -115,8 +115,8 @@ public class RangeIterationJVMTest {
 
     @test fun progressionMinValueToMinValue() {
         doTest(MinI..MinI step 1, MinI, MinI, 1, listOf(MinI))
-        doTest(MinB..MinB step 1, MinB, MinB, 1, listOf(MinB))
+        doTest(MinB..MinB step 1, MinB.toInt(), MinB.toInt(), 1, listOf(MinB.toInt()))
-        doTest(MinS..MinS step 1, MinS, MinS, 1, listOf(MinS))
+        doTest(MinS..MinS step 1, MinS.toInt(), MinS.toInt(), 1, listOf(MinS.toInt()))
         doTest(MinL..MinL step 1, MinL, MinL, 1.toLong(), listOf(MinL))
 
         doTest(MinC..MinC step 1, MinC, MinC, 1, listOf(MinC))
@@ -124,8 +124,8 @@ public class RangeIterationJVMTest {
 
     @test fun inexactToMaxValue() {
         doTest((MaxI - 5)..MaxI step 3, MaxI - 5, MaxI, 3, listOf(MaxI - 5, MaxI - 2))
-        doTest((MaxB - 5).toByte()..MaxB step 3, (MaxB - 5).toByte(), MaxB, 3, listOf((MaxB - 5).toByte(), (MaxB - 2).toByte()))
+        doTest((MaxB - 5).toByte()..MaxB step 3, (MaxB - 5).toInt(), MaxB.toInt(), 3, listOf((MaxB - 5).toInt(), (MaxB - 2).toInt()))
-        doTest((MaxS - 5).toShort()..MaxS step 3, (MaxS - 5).toShort(), MaxS, 3, listOf((MaxS - 5).toShort(), (MaxS - 2).toShort()))
+        doTest((MaxS - 5).toShort()..MaxS step 3, (MaxS - 5).toInt(), MaxS.toInt(), 3, listOf((MaxS - 5).toInt(), (MaxS - 2).toInt()))
         doTest((MaxL - 5).toLong()..MaxL step 3, (MaxL - 5).toLong(), MaxL, 3.toLong(), listOf((MaxL - 5).toLong(), (MaxL - 2).toLong()))
 
         doTest((MaxC - 5)..MaxC step 3, (MaxC - 5), MaxC, 3, listOf((MaxC - 5), (MaxC - 2)))
@@ -133,8 +133,8 @@ public class RangeIterationJVMTest {
 
     @test fun progressionDownToMinValue() {
         doTest((MinI + 2) downTo MinI step 1, MinI + 2, MinI, -1, listOf(MinI + 2, MinI + 1, MinI))
-        doTest((MinB + 2).toByte() downTo MinB step 1, (MinB + 2).toByte(), MinB, -1, listOf((MinB + 2).toByte(), (MinB + 1).toByte(), MinB))
+        doTest((MinB + 2).toByte() downTo MinB step 1, (MinB + 2).toInt(), MinB.toInt(), -1, listOf((MinB + 2).toInt(), (MinB + 1).toInt(), MinB.toInt()))
-        doTest((MinS + 2).toShort() downTo MinS step 1, (MinS + 2).toShort(), MinS, -1, listOf((MinS + 2).toShort(), (MinS + 1).toShort(), MinS))
+        doTest((MinS + 2).toShort() downTo MinS step 1, (MinS + 2).toInt(), MinS.toInt(), -1, listOf((MinS + 2).toInt(), (MinS + 1).toInt(), MinS.toInt()))
         doTest((MinL + 2).toLong() downTo MinL step 1, (MinL + 2).toLong(), MinL, -1.toLong(), listOf((MinL + 2).toLong(), (MinL + 1).toLong(), MinL))
 
         doTest((MinC + 2) downTo MinC step 1, (MinC + 2), MinC, -1, listOf((MinC + 2), (MinC + 1), MinC))
@@ -142,8 +142,8 @@ public class RangeIterationJVMTest {
 
     @test fun inexactDownToMinValue() {
         doTest((MinI + 5) downTo MinI step 3, MinI + 5, MinI, -3, listOf(MinI + 5, MinI + 2))
-        doTest((MinB + 5).toByte() downTo MinB step 3, (MinB + 5).toByte(), MinB, -3, listOf((MinB + 5).toByte(), (MinB + 2).toByte()))
+        doTest((MinB + 5).toByte() downTo MinB step 3, (MinB + 5).toInt(), MinB.toInt(), -3, listOf((MinB + 5).toInt(), (MinB + 2).toInt()))
-        doTest((MinS + 5).toShort() downTo MinS step 3, (MinS + 5).toShort(), MinS, -3, listOf((MinS + 5).toShort(), (MinS + 2).toShort()))
+        doTest((MinS + 5).toShort() downTo MinS step 3, (MinS + 5).toInt(), MinS.toInt(), -3, listOf((MinS + 5).toInt(), (MinS + 2).toInt()))
         doTest((MinL + 5).toLong() downTo MinL step 3, (MinL + 5).toLong(), MinL, -3.toLong(), listOf((MinL + 5).toLong(), (MinL + 2).toLong()))
 
         doTest((MinC + 5) downTo MinC step 3, (MinC + 5), MinC, -3, listOf((MinC + 5), (MinC + 2)))

libraries/stdlib/test/language/RangeIterationTest.kt

@@ -37,8 +37,8 @@ public class RangeIterationTest {
 
     @test fun emptyRange() {
         doTest(10..5, 10, 5, 1, listOf())
-        doTest(10.toByte()..(-5).toByte(), 10.toByte(), (-5).toByte(), 1, listOf())
+        doTest(10.toByte()..(-5).toByte(), 10, (-5), 1, listOf())
-        doTest(10.toShort()..(-5).toShort(), 10.toShort(), (-5).toShort(), 1, listOf())
+        doTest(10.toShort()..(-5).toShort(), 10, (-5), 1, listOf())
         doTest(10.toLong()..-5.toLong(), 10.toLong(), -5.toLong(), 1.toLong(), listOf())
 
         doTest('z'..'a', 'z', 'a', 1, listOf())
@@ -49,8 +49,8 @@ public class RangeIterationTest {
 
     @test fun oneElementRange() {
         doTest(5..5, 5, 5, 1, listOf(5))
-        doTest(5.toByte()..5.toByte(), 5.toByte(), 5.toByte(), 1, listOf(5.toByte()))
+        doTest(5.toByte()..5.toByte(), 5, 5, 1, listOf(5))
-        doTest(5.toShort()..5.toShort(), 5.toShort(), 5.toShort(), 1, listOf(5.toShort()))
+        doTest(5.toShort()..5.toShort(), 5, 5, 1, listOf(5))
         doTest(5.toLong()..5.toLong(), 5.toLong(), 5.toLong(), 1.toLong(), listOf(5.toLong()))
 
         doTest('k'..'k', 'k', 'k', 1, listOf('k'))
@@ -61,8 +61,8 @@ public class RangeIterationTest {
 
     @test fun simpleRange() {
         doTest(3..9, 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
-        doTest(3.toByte()..9.toByte(), 3.toByte(), 9.toByte(), 1, listOf<Byte>(3, 4, 5, 6, 7, 8, 9))
+        doTest(3.toByte()..9.toByte(), 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
-        doTest(3.toShort()..9.toShort(), 3.toShort(), 9.toShort(), 1, listOf<Short>(3, 4, 5, 6, 7, 8, 9))
+        doTest(3.toShort()..9.toShort(), 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
         doTest(3.toLong()..9.toLong(), 3.toLong(), 9.toLong(), 1.toLong(), listOf<Long>(3, 4, 5, 6, 7, 8, 9))
 
         doTest('c'..'g', 'c', 'g', 1, listOf('c', 'd', 'e', 'f', 'g'))
@@ -75,8 +75,8 @@ public class RangeIterationTest {
 
     @test fun simpleRangeWithNonConstantEnds() {
         doTest((1 + 2)..(10 - 1), 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
-        doTest((1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(), 3.toByte(), 9.toByte(), 1, listOf<Byte>(3, 4, 5, 6, 7, 8, 9))
+        doTest((1.toByte() + 2.toByte()).toByte()..(10.toByte() - 1.toByte()).toByte(), 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
-        doTest((1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(), 3.toShort(), 9.toShort(), 1, listOf<Short>(3, 4, 5, 6, 7, 8, 9))
+        doTest((1.toShort() + 2.toShort()).toShort()..(10.toShort() - 1.toShort()).toShort(), 3, 9, 1, listOf(3, 4, 5, 6, 7, 8, 9))
         doTest((1.toLong() + 2.toLong())..(10.toLong() - 1.toLong()), 3.toLong(), 9.toLong(), 1.toLong(), listOf<Long>(3, 4, 5, 6, 7, 8, 9))
 
         doTest(("ace"[1])..("age"[1]), 'c', 'g', 1, listOf('c', 'd', 'e', 'f', 'g'))
@@ -88,8 +88,8 @@ public class RangeIterationTest {
 
     @test fun openRange() {
         doTest(1 until 5, 1, 4, 1, listOf(1, 2, 3, 4))
-        doTest(1.toByte() until 5.toByte(), 1.toByte(), 4.toByte(), 1, listOf<Byte>(1, 2, 3, 4))
+        doTest(1.toByte() until 5.toByte(), 1, 4, 1, listOf(1, 2, 3, 4))
-        doTest(1.toShort() until 5.toShort(), 1.toShort(), 4.toShort(), 1, listOf<Short>(1, 2, 3, 4))
+        doTest(1.toShort() until 5.toShort(), 1, 4, 1, listOf(1, 2, 3, 4))
         doTest(1.toLong() until 5.toLong(), 1L, 4L, 1L, listOf<Long>(1, 2, 3, 4))
         doTest('a' until 'd', 'a', 'c', 1, listOf('a', 'b', 'c'))
     }
@@ -97,8 +97,8 @@ public class RangeIterationTest {
 
     @test fun emptyDownto() {
         doTest(5 downTo 10, 5, 10, -1, listOf())
-        doTest(5.toByte() downTo 10.toByte(), 5.toByte(), 10.toByte(), -1, listOf())
+        doTest(5.toByte() downTo 10.toByte(), 5, 10, -1, listOf())
-        doTest(5.toShort() downTo 10.toShort(), 5.toShort(), 10.toShort(), -1, listOf())
+        doTest(5.toShort() downTo 10.toShort(), 5, 10, -1, listOf())
         doTest(5.toLong() downTo 10.toLong(), 5.toLong(), 10.toLong(), -1.toLong(), listOf())
 
         doTest('a' downTo 'z', 'a', 'z', -1, listOf())
@@ -109,8 +109,8 @@ public class RangeIterationTest {
 
     @test fun oneElementDownTo() {
         doTest(5 downTo 5, 5, 5, -1, listOf(5))
-        doTest(5.toByte() downTo 5.toByte(), 5.toByte(), 5.toByte(), -1, listOf(5.toByte()))
+        doTest(5.toByte() downTo 5.toByte(), 5, 5, -1, listOf(5))
-        doTest(5.toShort() downTo 5.toShort(), 5.toShort(), 5.toShort(), -1, listOf(5.toShort()))
+        doTest(5.toShort() downTo 5.toShort(), 5, 5, -1, listOf(5))
         doTest(5.toLong() downTo 5.toLong(), 5.toLong(), 5.toLong(), -1.toLong(), listOf(5.toLong()))
 
         doTest('k' downTo 'k', 'k', 'k', -1, listOf('k'))
@@ -121,8 +121,8 @@ public class RangeIterationTest {
 
     @test fun simpleDownTo() {
         doTest(9 downTo 3, 9, 3, -1, listOf(9, 8, 7, 6, 5, 4, 3))
-        doTest(9.toByte() downTo 3.toByte(), 9.toByte(), 3.toByte(), -1, listOf<Byte>(9, 8, 7, 6, 5, 4, 3))
+        doTest(9.toByte() downTo 3.toByte(), 9, 3, -1, listOf(9, 8, 7, 6, 5, 4, 3))
-        doTest(9.toShort() downTo 3.toShort(), 9.toShort(), 3.toShort(), -1, listOf<Short>(9, 8, 7, 6, 5, 4, 3))
+        doTest(9.toShort() downTo 3.toShort(), 9, 3, -1, listOf(9, 8, 7, 6, 5, 4, 3))
         doTest(9.toLong() downTo 3.toLong(), 9.toLong(), 3.toLong(), -1.toLong(), listOf<Long>(9, 8, 7, 6, 5, 4, 3))
 
         doTest('g' downTo 'c', 'g', 'c', -1, listOf('g', 'f', 'e', 'd', 'c'))
@@ -135,8 +135,8 @@ public class RangeIterationTest {
 
     @test fun simpleSteppedRange() {
         doTest(3..9 step 2, 3, 9, 2, listOf(3, 5, 7, 9))
-        doTest(3.toByte()..9.toByte() step 2, 3.toByte(), 9.toByte(), 2, listOf<Byte>(3, 5, 7, 9))
+        doTest(3.toByte()..9.toByte() step 2, 3, 9, 2, listOf(3, 5, 7, 9))
-        doTest(3.toShort()..9.toShort() step 2, 3.toShort(), 9.toShort(), 2, listOf<Short>(3, 5, 7, 9))
+        doTest(3.toShort()..9.toShort() step 2, 3, 9, 2, listOf(3, 5, 7, 9))
         doTest(3.toLong()..9.toLong() step 2.toLong(), 3.toLong(), 9.toLong(), 2.toLong(), listOf<Long>(3, 5, 7, 9))
 
         doTest('c'..'g' step 2, 'c', 'g', 2, listOf('c', 'e', 'g'))
@@ -148,8 +148,8 @@ public class RangeIterationTest {
 
     @test fun simpleSteppedDownTo() {
         doTest(9 downTo 3 step 2, 9, 3, -2, listOf(9, 7, 5, 3))
-        doTest(9.toByte() downTo 3.toByte() step 2, 9.toByte(), 3.toByte(), -2, listOf<Byte>(9, 7, 5, 3))
+        doTest(9.toByte() downTo 3.toByte() step 2, 9, 3, -2, listOf(9, 7, 5, 3))
-        doTest(9.toShort() downTo 3.toShort() step 2, 9.toShort(), 3.toShort(), -2, listOf<Short>(9, 7, 5, 3))
+        doTest(9.toShort() downTo 3.toShort() step 2, 9, 3, -2, listOf(9, 7, 5, 3))
         doTest(9.toLong() downTo 3.toLong() step 2.toLong(), 9.toLong(), 3.toLong(), -2.toLong(), listOf<Long>(9, 7, 5, 3))
 
         doTest('g' downTo 'c' step 2, 'g', 'c', -2, listOf('g', 'e', 'c'))
@@ -163,8 +163,8 @@ public class RangeIterationTest {
     // 'inexact' means last element is not equal to sequence end
     @test fun inexactSteppedRange() {
         doTest(3..8 step 2, 3, 8, 2, listOf(3, 5, 7))
-        doTest(3.toByte()..8.toByte() step 2, 3.toByte(), 8.toByte(), 2, listOf<Byte>(3, 5, 7))
+        doTest(3.toByte()..8.toByte() step 2, 3, 8, 2, listOf(3, 5, 7))
-        doTest(3.toShort()..8.toShort() step 2, 3.toShort(), 8.toShort(), 2, listOf<Short>(3, 5, 7))
+        doTest(3.toShort()..8.toShort() step 2, 3, 8, 2, listOf(3, 5, 7))
         doTest(3.toLong()..8.toLong() step 2.toLong(), 3.toLong(), 8.toLong(), 2.toLong(), listOf<Long>(3, 5, 7))
 
         doTest('a'..'d' step 2, 'a', 'd', 2, listOf('a', 'c'))
@@ -177,8 +177,8 @@ public class RangeIterationTest {
     // 'inexact' means last element is not equal to sequence end
     @test fun inexactSteppedDownTo() {
         doTest(8 downTo 3 step 2, 8, 3, -2, listOf(8, 6, 4))
-        doTest(8.toByte() downTo 3.toByte() step 2, 8.toByte(), 3.toByte(), -2, listOf<Byte>(8, 6, 4))
+        doTest(8.toByte() downTo 3.toByte() step 2, 8, 3, -2, listOf(8, 6, 4))
-        doTest(8.toShort() downTo 3.toShort() step 2, 8.toShort(), 3.toShort(), -2, listOf<Short>(8, 6, 4))
+        doTest(8.toShort() downTo 3.toShort() step 2, 8, 3, -2, listOf(8, 6, 4))
         doTest(8.toLong() downTo 3.toLong() step 2.toLong(), 8.toLong(), 3.toLong(), -2.toLong(), listOf<Long>(8, 6, 4))
 
         doTest('d' downTo 'a' step 2, 'd', 'a', -2, listOf('d', 'b'))
@@ -191,8 +191,8 @@ public class RangeIterationTest {
 
     @test fun reversedEmptyRange() {
         doTest((5..3).reversed(), 3, 5, -1, listOf())
-        doTest((5.toByte()..3.toByte()).reversed(), 3.toByte(), 5.toByte(), -1, listOf())
+        doTest((5.toByte()..3.toByte()).reversed(), 3, 5, -1, listOf())
-        doTest((5.toShort()..3.toShort()).reversed(), 3.toShort(), 5.toShort(), -1, listOf())
+        doTest((5.toShort()..3.toShort()).reversed(), 3, 5, -1, listOf())
         doTest((5.toLong()..3.toLong()).reversed(), 3.toLong(), 5.toLong(), -1.toLong(), listOf())
 
         doTest(('c'..'a').reversed(), 'a', 'c', -1, listOf())
@@ -203,8 +203,8 @@ public class RangeIterationTest {
 
     @test fun reversedEmptyBackSequence() {
         doTest((3 downTo 5).reversed(), 5, 3, 1, listOf())
-        doTest((3.toByte() downTo 5.toByte()).reversed(), 5.toByte(), 3.toByte(), 1, listOf())
+        doTest((3.toByte() downTo 5.toByte()).reversed(), 5, 3, 1, listOf())
-        doTest((3.toShort() downTo 5.toShort()).reversed(), 5.toShort(), 3.toShort(), 1, listOf())
+        doTest((3.toShort() downTo 5.toShort()).reversed(), 5, 3, 1, listOf())
         doTest((3.toLong() downTo 5.toLong()).reversed(), 5.toLong(), 3.toLong(), 1.toLong(), listOf())
 
         doTest(('a' downTo 'c').reversed(), 'c', 'a', 1, listOf())
@@ -215,8 +215,8 @@ public class RangeIterationTest {
 
     @test fun reversedRange() {
         doTest((3..5).reversed(), 5, 3, -1, listOf(5, 4, 3))
-        doTest((3.toByte()..5.toByte()).reversed(), 5.toByte(), 3.toByte(), -1, listOf<Byte>(5, 4, 3))
+        doTest((3.toByte()..5.toByte()).reversed(),5, 3, -1, listOf(5, 4, 3))
-        doTest((3.toShort()..5.toShort()).reversed(), 5.toShort(), 3.toShort(), -1, listOf<Short>(5, 4, 3))
+        doTest((3.toShort()..5.toShort()).reversed(), 5, 3, -1, listOf(5, 4, 3))
         doTest((3.toLong()..5.toLong()).reversed(), 5.toLong(), 3.toLong(), -1.toLong(), listOf<Long>(5, 4, 3))
 
         doTest(('a'..'c').reversed(), 'c', 'a', -1, listOf('c', 'b', 'a'))
@@ -228,8 +228,8 @@ public class RangeIterationTest {
 
     @test fun reversedBackSequence() {
         doTest((5 downTo 3).reversed(), 3, 5, 1, listOf(3, 4, 5))
-        doTest((5.toByte() downTo 3.toByte()).reversed(), 3.toByte(), 5.toByte(), 1, listOf<Byte>(3, 4, 5))
+        doTest((5.toByte() downTo 3.toByte()).reversed(), 3, 5, 1, listOf(3, 4, 5))
-        doTest((5.toShort() downTo 3.toShort()).reversed(), 3.toShort(), 5.toShort(), 1, listOf<Short>(3, 4, 5))
+        doTest((5.toShort() downTo 3.toShort()).reversed(), 3, 5, 1, listOf(3, 4, 5))
         doTest((5.toLong() downTo 3.toLong()).reversed(), 3.toLong(), 5.toLong(), 1.toLong(), listOf<Long>(3, 4, 5))
 
         doTest(('c' downTo 'a').reversed(), 'a', 'c', 1, listOf('a', 'b', 'c'))
@@ -241,8 +241,8 @@ public class RangeIterationTest {
 
     @test fun reversedSimpleSteppedRange() {
         doTest((3..9 step 2).reversed(), 9, 3, -2, listOf(9, 7, 5, 3))
-        doTest((3.toByte()..9.toByte() step 2).reversed(), 9.toByte(), 3.toByte(), -2, listOf<Byte>(9, 7, 5, 3))
+        doTest((3.toByte()..9.toByte() step 2).reversed(), 9, 3, -2, listOf(9, 7, 5, 3))
-        doTest((3.toShort()..9.toShort() step 2).reversed(), 9.toShort(), 3.toShort(), -2, listOf<Short>(9, 7, 5, 3))
+        doTest((3.toShort()..9.toShort() step 2).reversed(), 9, 3, -2, listOf(9, 7, 5, 3))
         doTest((3.toLong()..9.toLong() step 2.toLong()).reversed(), 9.toLong(), 3.toLong(), -2.toLong(), listOf<Long>(9, 7, 5, 3))
 
         doTest(('c'..'g' step 2).reversed(), 'g', 'c', -2, listOf('g', 'e', 'c'))
@@ -255,8 +255,8 @@ public class RangeIterationTest {
     // 'inexact' means last element is not equal to sequence end
     @test fun reversedInexactSteppedDownTo() {
         doTest((8 downTo 3 step 2).reversed(), 3, 8, 2, listOf(3, 5, 7))
-        doTest((8.toByte() downTo 3.toByte() step 2).reversed(), 3.toByte(), 8.toByte(), 2, listOf<Byte>(3, 5, 7))
+        doTest((8.toByte() downTo 3.toByte() step 2).reversed(), 3, 8, 2, listOf(3, 5, 7))
-        doTest((8.toShort() downTo 3.toShort() step 2).reversed(), 3.toShort(), 8.toShort(), 2, listOf<Short>(3, 5, 7))
+        doTest((8.toShort() downTo 3.toShort() step 2).reversed(), 3, 8, 2, listOf(3, 5, 7))
         doTest((8.toLong() downTo 3.toLong() step 2.toLong()).reversed(), 3.toLong(), 8.toLong(), 2.toLong(), listOf<Long>(3, 5, 7))
 
         doTest(('d' downTo 'a' step 2).reversed(), 'a', 'd', 2, listOf('a', 'c'))

libraries/stdlib/test/language/RangeTest.kt

@@ -67,7 +67,8 @@ public class RangeTest {
         assertTrue(9.toByte() in openRange)
         assertFalse(10.toByte() in openRange)
 
-        assertTrue(assertFails { 0.toByte() until Byte.MIN_VALUE } is IllegalArgumentException)
+        // byte arguments now construct IntRange so no overflow here
+        // assertTrue(assertFails { 0.toByte() until Byte.MIN_VALUE } is IllegalArgumentException)
 
     }
 
@@ -100,7 +101,8 @@ public class RangeTest {
         assertTrue(9.toShort() in openRange)
         assertFalse(10.toShort() in openRange)
 
-        assertTrue(assertFails { 0.toShort() until Short.MIN_VALUE } is IllegalArgumentException)
+        // short arguments now construct IntRange so no overflow here
+        // assertTrue(assertFails { 0.toShort() until Short.MIN_VALUE } is IllegalArgumentException)
     }
 
     @test fun longRange() {