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

[FIR] Approximate all integer literals which resolved in independent mode

Browse Source 
#KT-42016
This commit is contained in:
Dmitriy Novozhilov
2020-09-18 11:05:44 +03:00
parent 5efd533f55
commit 4374c06537
22 changed files with 121 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/binaryExpressionCast.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
class Box<T>(val value: T)
fun box() : String {
val b = Box<Long>(2 * 3)
val b = Box<Long>(2l * 3)
val expected: Long? = 6L
return if (b.value == expected) "OK" else "fail"
}
}
compiler/testData/codegen/box/casts/literalExpressionAsGenericArgument/labeledExpressionCast.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
class Box<T>(val value: T)
fun box() : String {
val b = Box<Long>(x@ (1 + 2))
val b = Box<Long>(x@ (1l + 2))
val expected: Long? = 3L
return if (b.value == expected) "OK" else "fail"
}
}
compiler/testData/codegen/box/evaluate/intrinsics.kt
Vendored
-1
View File
@@ -1,4 +1,3 @@
// IGNORE_BACKEND_FIR: JVM_IR
// TARGET_BACKEND: JVM
// WITH_RUNTIME
compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.fir.kt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@ import kotlin.reflect.KProperty
operator fun Any.getValue(x: Any?, y: Any): Any = null!!
class C {
val x by <!UNRESOLVED_REFERENCE!>1<!>
val x by 1
val `$$delegatedProperties`: Array<KProperty<*>> = null!!
}
val x by <!UNRESOLVED_REFERENCE!>1<!>
val x by 1
val `$$delegatedProperties`: Array<KProperty<*>> = null!!
compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.fir.kt
Vendored
+4 -4
View File
@@ -10,21 +10,21 @@ fun test() {
<!INAPPLICABLE_CANDIDATE!>fooInt<!>(1 - 1.toLong())
fooInt(1 - 1.toShort())
fooByte(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 - 1.toInt())
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 - 1.toByte())
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 - 1.toLong())
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 - 1.toShort())
fooLong(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 - 1.toInt())
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 - 1.toByte())
fooLong(1 - 1.toLong())
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 - 1.toShort())
fooShort(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 - 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 - 1.toInt())
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 - 1.toByte())
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 - 1.toLong())
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 - 1.toShort())
}
}
compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.fir.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
fun fooInt(p: Int) = p
fun fooLong(p: Long) = p
fun fooByte(p: Byte) = p
fun fooShort(p: Short) = p
fun test() {
fooInt(1 + 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 + 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 + 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 + 1)
fooInt(1 * 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 * 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 * 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 * 1)
fooInt(1 / 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 / 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 / 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 / 1)
fooInt(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 % 1)
}
compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
fun fooInt(p: Int) = p
fun fooLong(p: Long) = p
fun fooByte(p: Byte) = p
@@ -24,4 +23,4 @@ fun test() {
fooByte(1 % 1)
fooLong(1 % 1)
fooShort(1 % 1)
}
}
compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.fir.kt
Vendored
+26
View File
@@ -0,0 +1,26 @@
fun fooInt(p: Int) = p
fun fooLong(p: Long) = p
fun fooByte(p: Byte) = p
fun fooShort(p: Short) = p
fun test() {
fooInt(1.plus(1))
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1.plus(1))
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1.plus(1))
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1.plus(1))
fooInt(1.times(1))
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1.times(1))
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1.times(1))
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1.times(1))
fooInt(1.div(1))
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1.div(1))
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1.div(1))
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1.div(1))
fooInt(1.rem(1))
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1.rem(1))
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1.rem(1))
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1.rem(1))
}
compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
fun fooInt(p: Int) = p
fun fooLong(p: Long) = p
fun fooByte(p: Byte) = p
@@ -24,4 +23,4 @@ fun test() {
fooByte(1.rem(1))
fooLong(1.rem(1))
fooShort(1.rem(1))
}
}
compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.fir.kt
Vendored
+13 -13
View File
@@ -5,22 +5,22 @@ fun fooShort(p: Short) = p
fun test() {
fooInt(1 plus 1)
fooByte(1 plus 1)
fooLong(1 plus 1)
fooShort(1 plus 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 plus 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 plus 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 plus 1)
fooInt(1 times 1)
fooByte(1 times 1)
fooLong(1 times 1)
fooShort(1 times 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 times 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 times 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 times 1)
fooInt(1 div 1)
fooByte(1 div 1)
fooLong(1 div 1)
fooShort(1 div 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 div 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 div 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 div 1)
fooInt(1 rem 1)
fooByte(1 rem 1)
fooLong(1 rem 1)
fooShort(1 rem 1)
}
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 rem 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 rem 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 rem 1)
}
compiler/testData/diagnostics/tests/inference/commonSystem/iltInsideSeveralCalls.kt
Vendored
+2 -2
View File
@@ -5,9 +5,9 @@ fun <T> consumeLongAndMaterialize(x: Long): T = null as T
fun consumeAny(x: Any) = x
fun main() {
consumeAny(consumeLongAndMaterialize(3 * 1000))
consumeAny(consumeLongAndMaterialize(3l * 1000))
if (true) {
consumeLongAndMaterialize(3 * 1000)
consumeLongAndMaterialize(3l * 1000)
} else true
}
compiler/testData/diagnostics/tests/operatorRem/numberRemConversions.fir.kt
Vendored
+4 -4
View File
@@ -7,9 +7,9 @@ fun fooShort(p: Short) = p
fun test() {
fooInt(1 % 1)
fooByte(1 % 1)
fooLong(1 % 1)
fooShort(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooByte<!>(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooLong<!>(1 % 1)
<!INAPPLICABLE_CANDIDATE!>fooShort<!>(1 % 1)
}
public operator fun Int.rem(other: Int): Int = 0
public operator fun Int.rem(other: Int): Int = 0
compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
fun testSimple() = Box<Long>(2 * 3)
fun testSimple() = Box<Long>(2l * 3)
inline fun <reified T> testArray(n: Int, crossinline block: () -> T): Array<T> {
return Array<T>(n) { block() }
compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt
Vendored
+3 -3
View File
@@ -29,7 +29,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
PROPERTY name:test4 visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.Long visibility:private [final,static]
EXPRESSION_BODY
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Long origin=null
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CONST Int type=kotlin.Int value=42
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:kotlin.Long
correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val]
@@ -39,7 +39,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
PROPERTY name:test5 visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test5 type:kotlin.Short visibility:private [final,static]
EXPRESSION_BODY
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Short origin=null
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CONST Int type=kotlin.Int value=42
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test5> visibility:public modality:FINAL <> () returnType:kotlin.Short
correspondingProperty: PROPERTY name:test5 visibility:public modality:FINAL [val]
@@ -49,7 +49,7 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
PROPERTY name:test6 visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test6 type:kotlin.Byte visibility:private [final,static]
EXPRESSION_BODY
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Byte origin=null
CALL 'public final fun unaryMinus (): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CONST Int type=kotlin.Int value=42
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test6> visibility:public modality:FINAL <> () returnType:kotlin.Byte
correspondingProperty: PROPERTY name:test6 visibility:public modality:FINAL [val]
compiler/testData/ir/irText/stubs/simple.fir.txt
Vendored
-12
View File
@@ -1,12 +0,0 @@
FILE fqName:<root> fileName:/simple.kt
PROPERTY name:test visibility:public modality:FINAL [val]
FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static]
EXPRESSION_BODY
CALL 'public final fun plus (other: kotlin.Int): kotlin.Int [operator] declared in kotlin.Int' type=kotlin.Int origin=null
$this: CONST Int type=kotlin.Int value=2
other: CONST Int type=kotlin.Int value=2
FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int
correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val]
BLOCK_BODY
RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Int declared in <root>'
GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:private [final,static]' type=kotlin.Int origin=null
compiler/testData/ir/irText/stubs/simple.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !DUMP_DEPENDENCIES
val test = 2 + 2