azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix loops over progressions near to MAX_VALUE/MIN_VALUE

Browse Source 
#KT-492 Fixed

For Byte, Char and Short ranges, promote the type of the loop parameter to int
to avoid overflows. For Int and Long ranges at the end of the loop over a
progression we now check if the new (incremented) value of the loop parameter
is greater than the old value iff increment > 0
This commit is contained in:
Alexander Udalov
2013-06-18 19:41:38 +04:00
parent 33d6347876
commit ee80e0b8ca
25 changed files with 1148 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactDownToMinValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = (MinI + 5) downTo MinI step 3
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MinI + 5, MinI + 2)) {
return "Wrong elements for (MinI + 5) downTo MinI step 3: $list1"
}
val list2 = ArrayList<Byte>()
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())) {
return "Wrong elements for (MinB + 5).toByte() downTo MinB step 3: $list2"
}
val list3 = ArrayList<Short>()
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())) {
return "Wrong elements for (MinS + 5).toShort() downTo MinS step 3: $list3"
}
val list4 = ArrayList<Long>()
val range4 = (MinL + 5).toLong() downTo MinL step 3
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>((MinL + 5).toLong(), (MinL + 2).toLong())) {
return "Wrong elements for (MinL + 5).toLong() downTo MinL step 3: $list4"
}
val list5 = ArrayList<Char>()
val range5 = (MinC + 5).toChar() downTo MinC step 3
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 5).toChar(), (MinC + 2).toChar())) {
return "Wrong elements for (MinC + 5).toChar() downTo MinC step 3: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/inexactToMaxValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = (MaxI - 5)..MaxI step 3
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MaxI - 5, MaxI - 2)) {
return "Wrong elements for (MaxI - 5)..MaxI step 3: $list1"
}
val list2 = ArrayList<Byte>()
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())) {
return "Wrong elements for (MaxB - 5).toByte()..MaxB step 3: $list2"
}
val list3 = ArrayList<Short>()
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())) {
return "Wrong elements for (MaxS - 5).toShort()..MaxS step 3: $list3"
}
val list4 = ArrayList<Long>()
val range4 = (MaxL - 5).toLong()..MaxL step 3
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>((MaxL - 5).toLong(), (MaxL - 2).toLong())) {
return "Wrong elements for (MaxL - 5).toLong()..MaxL step 3: $list4"
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 5).toChar()..MaxC step 3
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 5).toChar(), (MaxC - 2).toChar())) {
return "Wrong elements for (MaxC - 5).toChar()..MaxC step 3: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionDownToMinValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = (MinI + 2) downTo MinI step 1
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MinI + 2, MinI + 1, MinI)) {
return "Wrong elements for (MinI + 2) downTo MinI step 1: $list1"
}
val list2 = ArrayList<Byte>()
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)) {
return "Wrong elements for (MinB + 2).toByte() downTo MinB step 1: $list2"
}
val list3 = ArrayList<Short>()
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)) {
return "Wrong elements for (MinS + 2).toShort() downTo MinS step 1: $list3"
}
val list4 = ArrayList<Long>()
val range4 = (MinL + 2).toLong() downTo MinL step 1
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>((MinL + 2).toLong(), (MinL + 1).toLong(), MinL)) {
return "Wrong elements for (MinL + 2).toLong() downTo MinL step 1: $list4"
}
val list5 = ArrayList<Char>()
val range5 = (MinC + 2).toChar() downTo MinC step 1
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MinC + 2).toChar(), (MinC + 1).toChar(), MinC)) {
return "Wrong elements for (MinC + 2).toChar() downTo MinC step 1: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueMinusTwoToMaxValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = (MaxI - 2)..MaxI step 2
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MaxI - 2, MaxI)) {
return "Wrong elements for (MaxI - 2)..MaxI step 2: $list1"
}
val list2 = ArrayList<Byte>()
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)) {
return "Wrong elements for (MaxB - 2).toByte()..MaxB step 2: $list2"
}
val list3 = ArrayList<Short>()
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)) {
return "Wrong elements for (MaxS - 2).toShort()..MaxS step 2: $list3"
}
val list4 = ArrayList<Long>()
val range4 = (MaxL - 2).toLong()..MaxL step 2
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>((MaxL - 2).toLong(), MaxL)) {
return "Wrong elements for (MaxL - 2).toLong()..MaxL step 2: $list4"
}
val list5 = ArrayList<Char>()
val range5 = (MaxC - 2).toChar()..MaxC step 2
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>((MaxC - 2).toChar(), MaxC)) {
return "Wrong elements for (MaxC - 2).toChar()..MaxC step 2: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMaxValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = MaxI..MaxI step 1
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MaxI)) {
return "Wrong elements for MaxI..MaxI step 1: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = MaxB..MaxB step 1
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>(MaxB)) {
return "Wrong elements for MaxB..MaxB step 1: $list2"
}
val list3 = ArrayList<Short>()
val range3 = MaxS..MaxS step 1
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>(MaxS)) {
return "Wrong elements for MaxS..MaxS step 1: $list3"
}
val list4 = ArrayList<Long>()
val range4 = MaxL..MaxL step 1
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>(MaxL)) {
return "Wrong elements for MaxL..MaxL step 1: $list4"
}
val list5 = ArrayList<Char>()
val range5 = MaxC..MaxC step 1
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>(MaxC)) {
return "Wrong elements for MaxC..MaxC step 1: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMaxValueToMinValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = MaxI..MinI step 1
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>()) {
return "Wrong elements for MaxI..MinI step 1: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = MaxB..MinB step 1
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>()) {
return "Wrong elements for MaxB..MinB step 1: $list2"
}
val list3 = ArrayList<Short>()
val range3 = MaxS..MinS step 1
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>()) {
return "Wrong elements for MaxS..MinS step 1: $list3"
}
val list4 = ArrayList<Long>()
val range4 = MaxL..MinL step 1
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>()) {
return "Wrong elements for MaxL..MinL step 1: $list4"
}
val list5 = ArrayList<Char>()
val range5 = MaxC..MinC step 1
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>()) {
return "Wrong elements for MaxC..MinC step 1: $list5"
}
return "OK"
}
compiler/testData/codegen/boxWithStdlib/ranges/expression/progressionMinValueToMinValue.kt
+68
View File
@@ -0,0 +1,68 @@
// Auto-generated by org.jetbrains.jet.generators.tests.GenerateRangesCodegenTestData. DO NOT EDIT!
import java.util.ArrayList
import java.lang as j
import java.lang.Integer.MAX_VALUE as MaxI
import java.lang.Integer.MIN_VALUE as MinI
import java.lang.Byte.MAX_VALUE as MaxB
import java.lang.Byte.MIN_VALUE as MinB
import java.lang.Short.MAX_VALUE as MaxS
import java.lang.Short.MIN_VALUE as MinS
import java.lang.Long.MAX_VALUE as MaxL
import java.lang.Long.MIN_VALUE as MinL
import java.lang.Character.MAX_VALUE as MaxC
import java.lang.Character.MIN_VALUE as MinC
fun box(): String {
val list1 = ArrayList<Int>()
val range1 = MinI..MinI step 1
for (i in range1) {
list1.add(i)
if (list1.size() > 23) break
}
if (list1 != listOf<Int>(MinI)) {
return "Wrong elements for MinI..MinI step 1: $list1"
}
val list2 = ArrayList<Byte>()
val range2 = MinB..MinB step 1
for (i in range2) {
list2.add(i)
if (list2.size() > 23) break
}
if (list2 != listOf<Byte>(MinB)) {
return "Wrong elements for MinB..MinB step 1: $list2"
}
val list3 = ArrayList<Short>()
val range3 = MinS..MinS step 1
for (i in range3) {
list3.add(i)
if (list3.size() > 23) break
}
if (list3 != listOf<Short>(MinS)) {
return "Wrong elements for MinS..MinS step 1: $list3"
}
val list4 = ArrayList<Long>()
val range4 = MinL..MinL step 1
for (i in range4) {
list4.add(i)
if (list4.size() > 23) break
}
if (list4 != listOf<Long>(MinL)) {
return "Wrong elements for MinL..MinL step 1: $list4"
}
val list5 = ArrayList<Char>()
val range5 = MinC..MinC step 1
for (i in range5) {
list5.add(i)
if (list5.size() > 23) break
}
if (list5 != listOf<Char>(MinC)) {
return "Wrong elements for MinC..MinC step 1: $list5"
}
return "OK"
}