Skip to content

Commit 34ae02b

Browse files
mglukhikhSpace Team
mglukhikh
authored and
Space Team
committed
K1: add more tests for BI assignment checker, fix corner cases
Related to KT-54004 (cherry picked from commit 50cd560)
1 parent bc0aecc commit 34ae02b

File tree

6 files changed

+151
-8
lines changed

6 files changed

+151
-8
lines changed

‎compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/BuilderInferenceAssignmentChecker.kt

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,11 @@ import com.intellij.psi.PsiElement
99
import org.jetbrains.kotlin.config.LanguageFeature
1010
import org.jetbrains.kotlin.descriptors.PropertyDescriptor
1111
import org.jetbrains.kotlin.diagnostics.Errors
12+
import org.jetbrains.kotlin.lexer.KtTokens
1213
import org.jetbrains.kotlin.psi.KtBinaryExpression
1314
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
1415
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
15-
import org.jetbrains.kotlin.resolve.BindingContext
16-
import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfoBefore
1716
import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
18-
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue
19-
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory
20-
import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl
21-
import org.jetbrains.kotlin.resolve.calls.smartcasts.IdentifierInfo
2217
import org.jetbrains.kotlin.resolve.calls.util.getType
2318
import org.jetbrains.kotlin.types.StubTypeForBuilderInference
2419
import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
@@ -34,6 +29,7 @@ object BuilderInferenceAssignmentChecker : CallChecker {
3429
val callElement = resolvedCall.call.callElement
3530
if (callElement !is KtNameReferenceExpression) return
3631
val binaryExpression = callElement.getParentOfType<KtBinaryExpression>(strict = true) ?: return
32+
if (binaryExpression.operationToken != KtTokens.EQ) return
3733
if (!BasicExpressionTypingVisitor.isLValue(callElement, binaryExpression)) return
3834

3935
val leftType = resultingDescriptor.returnType?.takeIf { !it.isError } ?: return

‎compiler/testData/diagnostics/testsWithStdLib/builderInference/unsafeAssignment.fir.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ fun main(arg: Any) {
99
val x = 57
1010
val value = myBuilder {
1111
doSmthng("one ")
12-
a = <!ASSIGNMENT_TYPE_MISMATCH!>57<!>
12+
run { a; this }.a = <!ASSIGNMENT_TYPE_MISMATCH!>10<!>
13+
a += 1
14+
this.a = <!ASSIGNMENT_TYPE_MISMATCH!>57<!>
15+
this.(a) = 57
1316
a = <!ASSIGNMENT_TYPE_MISMATCH!>x<!>
17+
(a) = <!ASSIGNMENT_TYPE_MISMATCH!>x<!>
18+
a.<!FUNCTION_CALL_EXPECTED!>hashCode<!> = 99
1419
if (arg is String) {
1520
a = arg
1621
}

‎compiler/testData/diagnostics/testsWithStdLib/builderInference/unsafeAssignment.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,13 @@ fun main(arg: Any) {
99
val x = 57
1010
val value = myBuilder {
1111
doSmthng("one ")
12-
a = <!TYPE_MISMATCH!>57<!>
12+
run { a; this }.a = <!TYPE_MISMATCH, TYPE_MISMATCH!>10<!>
13+
<!BUILDER_INFERENCE_STUB_RECEIVER, STUB_TYPE_IN_RECEIVER_CAUSES_AMBIGUITY, TYPE_MISMATCH, TYPE_MISMATCH!>a<!> <!OVERLOAD_RESOLUTION_AMBIGUITY_BECAUSE_OF_STUB_TYPES!>+=<!> 1
14+
this.a = <!TYPE_MISMATCH!>57<!>
15+
this.<!ILLEGAL_SELECTOR, VARIABLE_EXPECTED!>(a)<!> = <!TYPE_MISMATCH!>57<!>
1316
a = <!TYPE_MISMATCH!>x<!>
17+
(a) = <!TYPE_MISMATCH!>x<!>
18+
<!TYPE_MISMATCH!>a<!>.<!FUNCTION_CALL_EXPECTED, VARIABLE_EXPECTED!>hashCode<!> = <!TYPE_MISMATCH, TYPE_MISMATCH!>99<!>
1419
if (arg is String) {
1520
a = arg
1621
}

‎compiler/testData/diagnostics/testsWithStdLib/builderInference/unsafeAssignmentExtra.fir.kt

+17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// WITH_REFLECT
2+
// FIR_DUMP
23
import kotlin.reflect.*
34

45
interface Foo<T : Any> {
@@ -57,4 +58,20 @@ fun main(arg: Any, condition: Boolean) {
5758
a = <!ASSIGNMENT_TYPE_MISMATCH!>67<!>
5859
}
5960
}
61+
62+
// See KT-54664
63+
val value3 = myBuilder {
64+
accept("")
65+
a = 45
66+
bar(::a)
67+
}
68+
69+
fun baz(t: Int) {}
70+
71+
val value4 = myBuilder {
72+
accept("")
73+
a = 45
74+
b[0] = 123
75+
baz(a)
76+
}
6077
}

‎compiler/testData/diagnostics/testsWithStdLib/builderInference/unsafeAssignmentExtra.fir.txt

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
FILE: unsafeAssignmentExtra.fir.kt
2+
public abstract interface Foo<T : R|kotlin/Any|> : R|kotlin/Any| {
3+
public abstract var a: R|T|
4+
public get(): R|T|
5+
public set(value: R|T|): R|kotlin/Unit|
6+
7+
public abstract val b: R|kotlin/Array<T>|
8+
public get(): R|kotlin/Array<T>|
9+
10+
public abstract fun accept(arg: R|T|): R|kotlin/Unit|
11+
12+
}
13+
public final class FooImpl<T : R|kotlin/Any|> : R|Foo<T>| {
14+
public constructor<T : R|kotlin/Any|>(): R|FooImpl<T>| {
15+
super<R|kotlin/Any|>()
16+
}
17+
18+
}
19+
public final fun bar(p: R|kotlin/reflect/KMutableProperty0<kotlin/Int>|): R|kotlin/Unit| {
20+
R|<local>/p|.R|SubstitutionOverride<kotlin/reflect/KMutableProperty0.set: R|kotlin/Unit|>|(Int(100))
21+
}
22+
public final fun <T : R|kotlin/Any|> myBuilder(block: R|Foo<T>.() -> kotlin/Unit|): R|Foo<T>| {
23+
^myBuilder R|/FooImpl.FooImpl|<R|T|>().R|kotlin/apply|<R|FooImpl<T>|>(R|<local>/block|)
24+
}
25+
public final fun <T : R|kotlin/Any|> R|Foo<T>|.change(block: R|Foo<T>.() -> kotlin/Unit|): R|Foo<T>| {
26+
R|<local>/block|.R|SubstitutionOverride<kotlin/Function1.invoke: R|kotlin/Unit|>|(this@R|/change|)
27+
^change this@R|/change|
28+
}
29+
public final fun main(arg: R|kotlin/Any|, condition: R|kotlin/Boolean|): R|kotlin/Unit| {
30+
lval value: R|Foo<kotlin/Int>| = R|/myBuilder|<R|kotlin/Int|>(<L> = myBuilder@fun R|Foo<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
31+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.b: R|kotlin/Array<Stub (chain inference): TypeVariable(T)>|>|.R|SubstitutionOverride<kotlin/Array.set: R|kotlin/Unit|>|(Int(0), Int(123))
32+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(45)
33+
lval <unary>: R|kotlin/Int| = this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|
34+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = R|<local>/<unary>|.<Ambiguity: inc, [kotlin/inc, kotlin/inc]>#()
35+
R|<local>/<unary>|
36+
R|/bar|(::R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|)
37+
when () {
38+
(this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| is R|kotlin/Int|) -> {
39+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(67)
40+
lval <unary>: R|kotlin/Int| = this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|
41+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = R|<local>/<unary>|.<Ambiguity: dec, [kotlin/dec, kotlin/dec]>#()
42+
R|<local>/<unary>|
43+
R|/bar|(::R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|)
44+
}
45+
}
46+
47+
when (R|<local>/condition|) {
48+
==($subj$, Boolean(true)) -> {
49+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(87)
50+
}
51+
==($subj$, Boolean(false)) -> {
52+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(65)
53+
}
54+
}
55+
56+
lval x: <ERROR TYPE REF: Ambiguity: getValue, [kotlin/getValue, kotlin/getValue, kotlin/getValue, kotlin/collections/getValue, kotlin/collections/getValue]>by this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|
57+
this@R|special/anonymous|.R|/change|<R|kotlin/Int|>(<L> = change@fun R|Foo<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
58+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(99)
59+
}
60+
)
61+
}
62+
)
63+
lval value2: R|Foo<kotlin/String>| = R|/myBuilder|<R|kotlin/String|>(<L> = myBuilder@fun R|Foo<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
64+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.accept: R|kotlin/Unit|>|(String())
65+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(45)
66+
when (R|<local>/condition|) {
67+
==($subj$, Boolean(true)) -> {
68+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(87)
69+
}
70+
==($subj$, Boolean(false)) -> {
71+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(65)
72+
}
73+
}
74+
75+
this@R|special/anonymous|.R|/change|<R|kotlin/String|>(<L> = change@fun R|Foo<kotlin/String>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
76+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(99)
77+
}
78+
)
79+
when () {
80+
(this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| is R|kotlin/Int|) -> {
81+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(67)
82+
}
83+
}
84+
85+
}
86+
)
87+
lval value3: R|Foo<kotlin/Int>| = R|/myBuilder|<R|kotlin/Int|>(<L> = myBuilder@fun R|Foo<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
88+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.accept: R|kotlin/Unit|>|(String())
89+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(45)
90+
R|/bar|(::R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|)
91+
}
92+
)
93+
local final fun baz(t: R|kotlin/Int|): R|kotlin/Unit| {
94+
}
95+
96+
lval value4: R|Foo<it(kotlin/Comparable<*> & java/io/Serializable)>| = R|/myBuilder|<R|it(kotlin/Comparable<*> & java/io/Serializable)|>(<L> = myBuilder@fun R|Foo<it(kotlin/Comparable<*> & java/io/Serializable)>|.<anonymous>(): R|kotlin/Unit| <inline=NoInline> {
97+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.accept: R|kotlin/Unit|>|(String())
98+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>| = Int(45)
99+
this@R|special/anonymous|.R|SubstitutionOverride</Foo.b: R|kotlin/Array<Stub (chain inference): TypeVariable(T)>|>|.R|SubstitutionOverride<kotlin/Array.set: R|kotlin/Unit|>|(Int(0), Int(123))
100+
R|<local>/baz|(this@R|special/anonymous|.R|SubstitutionOverride</Foo.a: R|Stub (chain inference): TypeVariable(T)|>|)
101+
}
102+
)
103+
}

‎compiler/testData/diagnostics/testsWithStdLib/builderInference/unsafeAssignmentExtra.kt

+17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// WITH_REFLECT
2+
// FIR_DUMP
23
import kotlin.reflect.*
34

45
interface Foo<T : Any> {
@@ -57,4 +58,20 @@ fun main(arg: Any, condition: Boolean) {
5758
a = <!TYPE_MISMATCH!>67<!>
5859
}
5960
}
61+
62+
// See KT-54664
63+
val value3 = myBuilder {
64+
accept(<!TYPE_MISMATCH!>""<!>)
65+
a = 45
66+
bar(<!TYPE_MISMATCH!>::a<!>)
67+
}
68+
69+
fun baz(t: Int) {}
70+
71+
val value4 = myBuilder {
72+
accept("")
73+
a = 45
74+
b[0] = 123
75+
baz(<!TYPE_MISMATCH, TYPE_MISMATCH!>a<!>)
76+
}
6077
}

0 commit comments

Comments
 (0)