Add additional invariant to check in Range.contains optimization tests.

Change expectations for double and float ranges according to #KT-4481
 #KT-5044 #KT-4481

Custom 'rangeTo' might be unoptimized, but still 'in' should not diverge from 'contains'.

compiler/testData/codegen/box/ranges/contains/inComparableRange.kt

@@ -10,6 +10,24 @@ class ComparablePair<T : Comparable<T>>(val first: T, val second: T) : Comparabl
     }
 }
 
+fun <T : Comparable<T>> genericRangeTo(start: T, endInclusive: T) = start..endInclusive
+operator fun Double.rangeTo(other: Double) = genericRangeTo(this, other)
+operator fun Float.rangeTo(other: Float) = ClosedFloatRange(this, other)
+
+fun check(x: Double, left: Double, right: Double): Boolean {
+    val result = x in left..right
+    val range = left..right
+    assert(result == x in range) { "Failed: unoptimized === unoptimized for custom double $range" }
+    return result
+}
+
+fun check(x: Float, left: Float, right: Float): Boolean {
+    val result = x in left..right
+    val range = left..right
+    assert(result == x in range) { "Failed: unoptimized === unoptimized for standard float $range" }
+    return result
+}
+
 fun box(): String {
     assert("a" !in "b".."c")
     assert("b" in "a".."d")
@@ -17,5 +35,11 @@ fun box(): String {
     assert(ComparablePair(2, 2) !in ComparablePair(1, 10)..ComparablePair(2, 1))
     assert(ComparablePair(2, 2) in ComparablePair(2, 0)..ComparablePair(2, 10))
 
+    assert(!check(-0.0, 0.0, 0.0))
+    assert(check(Double.NaN, Double.NaN, Double.NaN))
+
+    assert(check(-0.0f, 0.0f, 0.0f))
+    assert(!check(Float.NaN, Float.NaN, Float.NaN))
+
     return "OK"
 }

compiler/testData/codegen/box/ranges/contains/inOptimizableDoubleRange.kt

@@ -5,7 +5,10 @@
 
 fun check(x: Double, left: Double, right: Double): Boolean {
     val result = x in left..right
-    assert(result == checkUnoptimized(x, left..right))
+    val manual = x >= left && x <= right
+    val range = left..right
+    assert(result == manual) { "Failed: optimized === manual for $range" }
+    assert(result == checkUnoptimized(x, range)) { "Failed: optimized === unoptimized for $range" }
     return result
 }
 
@@ -19,13 +22,13 @@ fun box(): String {
 
     assert(check(Double.MIN_VALUE, 0.0, 1.0))
     assert(check(Double.MAX_VALUE, Double.MAX_VALUE - Double.MIN_VALUE, Double.MAX_VALUE))
-    assert(check(Double.NaN, Double.NaN, Double.NaN))
+    assert(!check(Double.NaN, Double.NaN, Double.NaN))
     assert(!check(0.0, Double.NaN, Double.NaN))
 
     assert(check(-0.0, -0.0, +0.0))
     assert(check(-0.0, -0.0, -0.0))
-    assert(!check(-0.0, +0.0, +0.0))
-    assert(!check(+0.0, -0.0, -0.0))
+    assert(check(-0.0, +0.0, +0.0))
+    assert(check(+0.0, -0.0, -0.0))
     assert(check(+0.0, +0.0, +0.0))
     assert(check(+0.0, -0.0, +0.0))
 

compiler/testData/codegen/box/ranges/contains/inOptimizableFloatRange.kt

@@ -5,7 +5,10 @@
 
 fun check(x: Float, left: Float, right: Float): Boolean {
     val result = x in left..right
-    assert(result == checkUnoptimized(x, left..right))
+    val manual = x >= left && x <= right
+    val range = left..right
+    assert(result == manual) { "Failed: optimized === manual for $range" }
+    assert(result == checkUnoptimized(x, range)) { "Failed: optimized === unoptimized for $range" }
     return result
 }
 
@@ -19,13 +22,13 @@ fun box(): String {
 
     assert(check(Float.MIN_VALUE, 0.0f, 1.0f))
     assert(check(Float.MAX_VALUE, Float.MAX_VALUE - Float.MIN_VALUE, Float.MAX_VALUE))
-    assert(check(Float.NaN, Float.NaN, Float.NaN))
+    assert(!check(Float.NaN, Float.NaN, Float.NaN))
     assert(!check(0.0f, Float.NaN, Float.NaN))
 
     assert(check(-0.0f, -0.0f, +0.0f))
     assert(check(-0.0f, -0.0f, -0.0f))
-    assert(!check(-0.0f, +0.0f, +0.0f))
-    assert(!check(+0.0f, -0.0f, -0.0f))
+    assert(check(-0.0f, +0.0f, +0.0f))
+    assert(check(+0.0f, -0.0f, -0.0f))
     assert(check(+0.0f, +0.0f, +0.0f))
     assert(check(+0.0f, -0.0f, +0.0f))
 

compiler/testData/codegen/box/ranges/contains/inOptimizableIntRange.kt

@@ -5,7 +5,10 @@
 
 fun check(x: Int, left: Int, right: Int): Boolean {
     val result = x in left..right
-    assert(result == checkUnoptimized(x, left..right))
+    val manual = x >= left && x <= right
+    val range = left..right
+    assert(result == manual) { "Failed: optimized === manual for $range" }
+    assert(result == checkUnoptimized(x, range)) { "Failed: optimized === unoptimized for $range" }
     return result
 }
 

compiler/testData/codegen/box/ranges/contains/inOptimizableLongRange.kt

@@ -5,7 +5,10 @@
 
 fun check(x: Long, left: Long, right: Long): Boolean {
     val result = x in left..right
-    assert(result == checkUnoptimized(x, left..right))
+    val manual = x >= left && x <= right
+    val range = left..right
+    assert(result == manual) { "Failed: optimized === manual for $range" }
+    assert(result == checkUnoptimized(x, range)) { "Failed: optimized === unoptimized for $range" }
     return result
 }