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

FIR: Update integer literal-related tests

Browse Source 
They started failing once we began reporting diagnostics from completion

^KT-46419 Relates
This commit is contained in:
Denis.Zharkov
2021-04-27 13:22:36 +03:00
committed by teamcityserver
parent 42d387925d
commit cd401b5b8a
18 changed files with 83 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/argumentOrder/defaults.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
var invokeOrder: String = ""
fun test(x: Double = { invokeOrder += "x"; 1.0 }(), a: String, y: Long = { invokeOrder += "y"; 1 }(), b: String): String {
fun test(x: Double = { invokeOrder += "x"; 1.0 }(), a: String, y: Long = { invokeOrder += "y"; 1L }(), b: String): String {
return "" + x.toInt() + a + b + y;
}
@@ -10,4 +10,4 @@ fun box(): String {
if (invokeOrder != "KOxy" || funResult != "1OK1") return "fail: $invokeOrder != KOxy or $funResult != 1OK1"
return "OK"
}
}
compiler/testData/codegen/box/binaryOp/call.kt
Vendored
+3 -1
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte = 1.plus(1)
val a2: Short = 1.plus(1)
@@ -18,4 +20,4 @@ fun box(): String {
if (a8 != 1) return "fail 8"
return "OK"
}
}
compiler/testData/codegen/box/binaryOp/callNullable.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte? = 1.plus(1)
val a2: Short? = 1.plus(1)
compiler/testData/codegen/box/binaryOp/intrinsic.kt
Vendored
+3 -1
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte = 1 + 1
val a2: Short = 1 + 1
@@ -18,4 +20,4 @@ fun box(): String {
if (a8 != 1) return "fail 8"
return "OK"
}
}
compiler/testData/codegen/box/binaryOp/intrinsicNullable.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte? = 1 + 1
val a2: Short? = 1 + 1
compiler/testData/codegen/box/binaryOp/overflowLong.kt
Vendored
+3 -1
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a: Long = 2147483647 + 1
if (a != -2147483648L) return "fail: in this case we should add to ints and than cast the result to long - overflow expected"
@@ -11,4 +13,4 @@ fun box(): String {
if (l4 < l3) return "fail: Long.MIN_VALUE - 1 should overflow to positive."
return "OK"
}
}
compiler/testData/codegen/box/fullJdk/kt46540.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// TARGET_BACKEND: JVM
// IGNORE_BACKEND_FIR: JVM_IR
// SKIP_JDK6
// FULL_JDK
compiler/testData/codegen/box/unaryOp/call.kt
Vendored
+3 -1
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte = 1.unaryMinus()
val a2: Short = 1.unaryMinus()
@@ -14,4 +16,4 @@ fun box(): String {
if (a6 != -1f) return "fail 6"
return "OK"
}
}
compiler/testData/codegen/box/unaryOp/callNullable.kt
Vendored
+2
View File
@@ -1,3 +1,5 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a1: Byte? = 1.unaryMinus()
val a2: Short? = 1.unaryMinus()
compiler/testData/codegen/box/unaryOp/longOverflow.kt
Vendored
+3 -1
View File
@@ -1,5 +1,7 @@
// IGNORE_BACKEND_FIR: JVM_IR
fun box(): String {
val a: Long = -(1 shl 31)
if (a != -2147483648L) return "fail: in this case we should add to ints and than cast the result to long - overflow expected"
return "OK"
}
}
compiler/testData/codegen/bytecodeText/constants/byte.kt
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// IGNORE_BACKEND_FIR: JVM_IR
val a: Byte = 1 + 10
// 1 BIPUSH 11
// 1 BIPUSH 11
compiler/testData/codegen/bytecodeText/constants/short.kt
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// IGNORE_BACKEND_FIR: JVM_IR
val a: Short = 1 + 255
// 1 SIPUSH 256
// 1 SIPUSH 256
compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.fir.kt
Vendored
+15 -15
View File
@@ -1,24 +1,24 @@
val p1: Int = 1 - 1
val p2: Long = 1 - 1
val p3: Byte = 1 - 1
val p4: Short = 1 - 1
val p2: Long = <!TYPE_MISMATCH!>1 - 1<!>
val p3: Byte = <!TYPE_MISMATCH!>1 - 1<!>
val p4: Short = <!TYPE_MISMATCH!>1 - 1<!>
val l1: Long = 1 - 1.toLong()
val l2: Byte = <!INITIALIZER_TYPE_MISMATCH!>1 - 1.toLong()<!>
val l3: Int = <!INITIALIZER_TYPE_MISMATCH!>1 - 1.toLong()<!>
val l4: Short = <!INITIALIZER_TYPE_MISMATCH!>1 - 1.toLong()<!>
val l2: Byte = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>1 - 1.toLong()<!>
val l3: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>1 - 1.toLong()<!>
val l4: Short = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>1 - 1.toLong()<!>
val b1: Byte = 1 - 1.toByte()
val b1: Byte = <!TYPE_MISMATCH!>1 - 1.toByte()<!>
val b2: Int = 1 - 1.toByte()
val b3: Long = 1 - 1.toByte()
val b4: Short = 1 - 1.toByte()
val b3: Long = <!TYPE_MISMATCH!>1 - 1.toByte()<!>
val b4: Short = <!TYPE_MISMATCH!>1 - 1.toByte()<!>
val i1: Byte = 1 - 1.toInt()
val i1: Byte = <!TYPE_MISMATCH!>1 - 1.toInt()<!>
val i2: Int = 1 - 1.toInt()
val i3: Long = 1 - 1.toInt()
val i4: Short = 1 - 1.toInt()
val i3: Long = <!TYPE_MISMATCH!>1 - 1.toInt()<!>
val i4: Short = <!TYPE_MISMATCH!>1 - 1.toInt()<!>
val s1: Byte = 1 - 1.toShort()
val s1: Byte = <!TYPE_MISMATCH!>1 - 1.toShort()<!>
val s2: Int = 1 - 1.toShort()
val s3: Long = 1 - 1.toShort()
val s4: Short = 1 - 1.toShort()
val s3: Long = <!TYPE_MISMATCH!>1 - 1.toShort()<!>
val s4: Short = <!TYPE_MISMATCH!>1 - 1.toShort()<!>
compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
Vendored
+1 -1
View File
@@ -16,7 +16,7 @@ val a10 = <!DIVISION_BY_ZERO!>1 / 0.0f<!>
val a11 = <!DIVISION_BY_ZERO!>1 / 0.0<!>
val a12 = <!DIVISION_BY_ZERO!>1L / 0<!>
val b1: Byte = <!DIVISION_BY_ZERO!>1 / 0<!>
val b1: Byte = <!TYPE_MISMATCH!>1 / 0<!>
@Ann(<!ANNOTATION_ARGUMENT_MUST_BE_CONST, DIVISION_BY_ZERO!>1 / 0<!>) val b2 = 1
annotation class Ann(val i : Int)
compiler/testData/diagnostics/tests/evaluate/parentesized.fir.kt
Vendored
+6 -6
View File
@@ -1,12 +1,12 @@
val p1: Byte = (1 + 2) * 2
val p2: Short = (1 + 2) * 2
val p1: Byte = <!TYPE_MISMATCH!>(1 + 2) * 2<!>
val p2: Short = <!TYPE_MISMATCH!>(1 + 2) * 2<!>
val p3: Int = (1 + 2) * 2
val p4: Long = (1 + 2) * 2
val p4: Long = <!TYPE_MISMATCH!>(1 + 2) * 2<!>
val b1: Byte = (1.toByte() + 2) * 2
val b2: Short = (1.toShort() + 2) * 2
val b1: Byte = <!TYPE_MISMATCH!>(1.toByte() + 2) * 2<!>
val b2: Short = <!TYPE_MISMATCH!>(1.toShort() + 2) * 2<!>
val b3: Int = (1.toInt() + 2) * 2
val b4: Long = (1.toLong() + 2) * 2
val i1: Int = (1.toByte() + 2) * 2
val i2: Int = (1.toShort() + 2) * 2
val i2: Int = (1.toShort() + 2) * 2
compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.fir.kt
Vendored
+12 -12
View File
@@ -9,21 +9,21 @@ val lp3: Byte = <!INITIALIZER_TYPE_MISMATCH!>-1111111111111111111<!>
val lp4: Short = <!INITIALIZER_TYPE_MISMATCH!>-1111111111111111111<!>
val l1: Long = -1.toLong()
val l2: Byte = <!INITIALIZER_TYPE_MISMATCH!>-1.toLong()<!>
val l3: Int = <!INITIALIZER_TYPE_MISMATCH!>-1.toLong()<!>
val l4: Short = <!INITIALIZER_TYPE_MISMATCH!>-1.toLong()<!>
val l2: Byte = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>-1.toLong()<!>
val l3: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>-1.toLong()<!>
val l4: Short = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>-1.toLong()<!>
val b1: Byte = -1.toByte()
val b1: Byte = <!TYPE_MISMATCH!>-1.toByte()<!>
val b2: Int = -1.toByte()
val b3: Long = -1.toByte()
val b4: Short = -1.toByte()
val b3: Long = <!TYPE_MISMATCH!>-1.toByte()<!>
val b4: Short = <!TYPE_MISMATCH!>-1.toByte()<!>
val i1: Byte = -1.toInt()
val i1: Byte = <!TYPE_MISMATCH!>-1.toInt()<!>
val i2: Int = -1.toInt()
val i3: Long = -1.toInt()
val i4: Short = -1.toInt()
val i3: Long = <!TYPE_MISMATCH!>-1.toInt()<!>
val i4: Short = <!TYPE_MISMATCH!>-1.toInt()<!>
val s1: Byte = -1.toShort()
val s1: Byte = <!TYPE_MISMATCH!>-1.toShort()<!>
val s2: Int = -1.toShort()
val s3: Long = -1.toShort()
val s4: Short = -1.toShort()
val s3: Long = <!TYPE_MISMATCH!>-1.toShort()<!>
val s4: Short = <!TYPE_MISMATCH!>-1.toShort()<!>
compiler/testData/ir/irText/expressions/primitivesImplicitConversions.kt
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
// IGNORE_BACKEND_FIR: ANY
val test1: Long = 42
val test2: Short = 42
val test3: Byte = 42
@@ -17,4 +18,4 @@ fun test() {
fun testImplicitArguments(x: Long = 1.unaryMinus()) {}
class TestImplicitArguments(val x: Long = 1.unaryMinus())
class TestImplicitArguments(val x: Long = 1.unaryMinus())
jps-plugin/testData/incremental/pureKotlin/allConstants/fir-build.log
Vendored
+19
View File
@@ -0,0 +1,19 @@
================ Step #1 =================
Compiling files:
src/const.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Type mismatch: inferred type is kotlin/Int but kotlin/Byte was expected
Type mismatch: inferred type is kotlin/Int but kotlin/Short was expected
================ Step #2 =================
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK