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

[FIR] Implement checker for value parameter default value type mismatch

Browse Source 
#KT-58901 Fixed
This commit is contained in:
Kirill Rakhman
2023-06-22 13:33:09 +02:00
committed by Space Team
parent cfc824f9f2
commit 028921ade1
19 changed files with 152 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/DefaultValuesTypechecking.fir.kt
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
val x = ""
fun bar(x : Int = "", y : Int = x, z : String = y) {
fun bar(x : Int = <!INITIALIZER_TYPE_MISMATCH!>""<!>, y : Int = x, z : String = <!INITIALIZER_TYPE_MISMATCH!>y<!>) {
}
@@ -8,7 +8,7 @@ fun bar(x : Int = "", y : Int = x, z : String = y) {
class A(x : Int = <!UNINITIALIZED_PARAMETER!>y<!>, y : Int = x) { // None of the references is resolved, no types checked
constructor(x : Int = <!UNINITIALIZED_PARAMETER!>x<!>) : this(x, x)
fun foo(bool: Boolean, a: Int = <!UNINITIALIZED_PARAMETER!>b<!>, b: String = a) {}
fun foo(bool: Boolean, a: Int = <!INITIALIZER_TYPE_MISMATCH, UNINITIALIZED_PARAMETER!>b<!>, b: String = <!INITIALIZER_TYPE_MISMATCH!>a<!>) {}
}
val z = 3
compiler/testData/diagnostics/tests/ObjectWithConstructor.fir.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
object A1<!CONSTRUCTOR_IN_OBJECT!>()<!> {
<!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!UNRESOLVED_REFERENCE!>this<!>() {
<!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = <!INITIALIZER_TYPE_MISMATCH!>""<!>, y: Int)<!> : <!UNRESOLVED_REFERENCE!>this<!>() {
x + y
}
}
object A2 public <!CONSTRUCTOR_IN_OBJECT!>constructor(private val prop: Int)<!> {
<!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = "", y: Int)<!> : <!NONE_APPLICABLE!>this<!>(x * y) {
<!CONSTRUCTOR_IN_OBJECT!>constructor(x: Int = <!INITIALIZER_TYPE_MISMATCH!>""<!>, y: Int)<!> : <!NONE_APPLICABLE!>this<!>(x * y) {
x + y
}
}
compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@ annotation class Ann4(vararg val a: String = ["/"])
annotation class Ann5(vararg val a: Ann4 = [])
annotation class Ann6(vararg val a: Ann4 = [Ann4(*["a", "b"])])
annotation class Ann7(vararg val a: Long = [1L, null, ""])
annotation class Ann7(vararg val a: Long = <!INITIALIZER_TYPE_MISMATCH!>[1L, null, ""]<!>)
@Ann1(*[])
fun test1_0() {}
compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
Vendored
+4 -4
View File
@@ -5,9 +5,9 @@ annotation class Foo(
)
annotation class Bar(
val a: Array<String> = [' '],
val a: Array<String> = <!INITIALIZER_TYPE_MISMATCH!>[' ']<!>,
val b: Array<String> = ["", <!EMPTY_CHARACTER_LITERAL!>''<!>],
val c: Array<String> = [1]
val c: Array<String> = <!INITIALIZER_TYPE_MISMATCH!>[1]<!>
)
annotation class Base(
@@ -18,6 +18,6 @@ annotation class Base(
)
annotation class Err(
val a: IntArray = [1L],
val b: Array<String> = [1]
val a: IntArray = <!INITIALIZER_TYPE_MISMATCH!>[1L]<!>,
val b: Array<String> = <!INITIALIZER_TYPE_MISMATCH!>[1]<!>
)
compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesWithConstantsInAnnotation.fir.kt
Vendored
+3 -3
View File
@@ -17,7 +17,7 @@ annotation class Bar(
)
annotation class Baz(
val a: IntArray = [null],
val b: IntArray = [1, null, 2],
val c: IntArray = [<!NO_THIS!>this<!>]
val a: IntArray = <!INITIALIZER_TYPE_MISMATCH!>[null]<!>,
val b: IntArray = <!INITIALIZER_TYPE_MISMATCH!>[1, null, 2]<!>,
val c: IntArray = <!INITIALIZER_TYPE_MISMATCH!>[<!NO_THIS!>this<!>]<!>
)
compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
Vendored
+1 -1
View File
@@ -1,2 +1,2 @@
annotation class A(val a: IntArray = <!TYPE_MISMATCH!>arrayOf(1)<!>)
annotation class A(val a: IntArray = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>arrayOf(1)<!>)
annotation class B(val a: IntArray = intArrayOf(1))
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.fir.kt
Vendored
+88
View File
@@ -0,0 +1,88 @@
// MODULE: m1-common
// FILE: common.kt
import kotlin.reflect.KClass
expect annotation class Primitives(
val z: Boolean = true,
val c: Char = 'c',
val b: Byte = 42.toByte(),
val s: Short = (-1).toShort(),
val i: Int = -42,
val f: Float = 2.72f,
val j: Long = 123456789123456789L,
val d: Double = 3.14159265358979
)
expect annotation class PrimitiveArrays(
val z: BooleanArray = [true],
val c: CharArray = ['c'],
val b: ByteArray = [42.toByte()],
val s: ShortArray = [(-1).toShort()],
val i: IntArray = [-42],
val f: FloatArray = [2.72f],
val j: LongArray = [123456789123456789L],
val d: DoubleArray = [3.14159265358979]
)
enum class En { A, B }
annotation class Anno(val value: String = "Anno")
expect annotation class Classes(
val s: String = "OK",
val e: En = En.B,
// TODO: this does not work at the moment because AnnotationDescriptor subclasses do not implement equals correctly
// val a: Anno = Anno(),
val k: KClass<*> = List::class
)
expect annotation class ClassArrays(
val s: Array<String> = ["OK"],
val e: Array<En> = [En.B],
// val a: Array<Anno> = [Anno()],
val k: Array<KClass<*>> = <!INITIALIZER_TYPE_MISMATCH!>[List::class]<!>, // KT-59581
vararg val v: Int = [42]
)
// MODULE: m2-jvm()()(m1-common)
// FILE: jvm.kt
import kotlin.reflect.KClass
actual annotation class Primitives(
actual val z: Boolean = true,
actual val c: Char = 'c',
actual val b: Byte = 42.toByte(),
actual val s: Short = (-1).toShort(),
actual val i: Int = -42,
actual val f: Float = 2.72f,
actual val j: Long = 123456789123456789L,
actual val d: Double = 3.14159265358979
)
actual annotation class PrimitiveArrays(
actual val z: BooleanArray = [true],
actual val c: CharArray = ['c'],
actual val b: ByteArray = [42.toByte()],
actual val s: ShortArray = [(-1).toShort()],
actual val i: IntArray = [-42],
actual val f: FloatArray = [2.72f],
actual val j: LongArray = [123456789123456789L],
actual val d: DoubleArray = [3.14159265358979]
)
actual annotation class Classes(
actual val s: String = "OK",
actual val e: En = En.B,
// actual val a: Anno = Anno(),
actual val k: KClass<*> = List::class
)
actual annotation class ClassArrays(
actual val s: Array<String> = ["OK"],
actual val e: Array<En> = [En.B],
// actual val a: Array<Anno> = [Anno()],
actual val k: Array<KClass<*>> = <!INITIALIZER_TYPE_MISMATCH!>[List::class]<!>,
actual vararg val v: Int = [42]
)
compiler/testData/diagnostics/tests/multiplatform/defaultArguments/annotationArgumentEquality.kt
Vendored
+1 -2
View File
@@ -1,4 +1,3 @@
// FIR_IDENTICAL
// MODULE: m1-common
// FILE: common.kt
@@ -42,7 +41,7 @@ expect annotation class ClassArrays(
val s: Array<String> = ["OK"],
val e: Array<En> = [En.B],
// val a: Array<Anno> = [Anno()],
val k: Array<KClass<*>> = [List::class],
val k: Array<KClass<*>> = [List::class], // KT-59581
vararg val v: Int = [42]
)
compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.fir.kt
Vendored
+1 -1
View File
@@ -21,7 +21,7 @@ fun test() {
// platform type with no annotation
val platformJ = J.staticJ
fun foo(p: J = platformNN, p1: J = platformN, p2: J = platformJ) {}
fun foo(p: J = platformNN, p1: J = <!INITIALIZER_TYPE_MISMATCH!>platformN<!>, p2: J = platformJ) {}
fun foo1(p: J? = platformNN, p1: J? = platformN, p2: J? = platformJ) {}
}
compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccess.fir.kt
Vendored
+1 -1
View File
@@ -3,6 +3,6 @@ open class B(x: Int) {
fun foo() = 1
}
class A : B {
constructor(x: Int, y: Int = <!TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>) :
constructor(x: Int, y: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>) :
super(<!ARGUMENT_TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>)
}
compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superFunAccessOverriden.fir.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ open class B(x: Int) {
}
class A : B {
override fun foo() = 2
constructor(x: Int, y: Int = <!TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>) :
constructor(x: Int, y: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>) :
super(<!ARGUMENT_TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>foo<!>() <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.foo() + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.foo()<!>)
}
compiler/testData/diagnostics/tests/secondaryConstructors/headerCallChecker/superPropertyAccess.fir.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
open class B(val prop: Int)
class A : B {
constructor(x: Int, y: Int = <!TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>prop<!> <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.prop + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.prop<!>) :
constructor(x: Int, y: Int = <!INITIALIZER_TYPE_MISMATCH, TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>prop<!> <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.prop + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.prop<!>) :
super(<!ARGUMENT_TYPE_MISMATCH!>x + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>prop<!> <!OVERLOAD_RESOLUTION_AMBIGUITY!>+<!> <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>this<!>.prop + <!INSTANCE_ACCESS_BEFORE_SUPER_CALL!>super<!>.prop<!>)
}