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

[FE 1.0] Create DONT_CARE type only for callable references with no expected type

Browse Source 
Otherwise, it can be resolved safety

^KT-52270 Fixed
This commit is contained in:
Victor Petukhov
2022-07-09 11:44:23 +02:00
committed by teamcity
parent fb21937eb1
commit 2057deb91b
10 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -3147,6 +3147,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
+1 -1
View File
@@ -382,7 +382,7 @@ public class ExpressionTypingServices {
)
);
if (!isUnitExpectedType && statementExpression instanceof KtCallableReferenceExpression) {
if (context.expectedType == NO_EXPECTED_TYPE && statementExpression instanceof KtCallableReferenceExpression) {
KotlinTypeInfo typeInfo = createDontCareTypeInfoForNILambda(statementExpression, context);
if (typeInfo != null) return typeInfo;
}
compiler/testData/codegen/box/callableReference/kt52270.kt
Vendored
+61
View File
@@ -0,0 +1,61 @@
// WITH_STDLIB
import kotlin.random.Random
fun fun1() {
}
fun fun2() {
}
fun takesLambda(lambda: () -> Unit) {
lambda()
}
fun takesOtherLambda(lambda: () -> Unit) = lambda()
fun foo() {}
fun bar2(): Int = 1
fun <K> foo4(): K = 2 as K
fun test1(): String {
takesOtherLambda {
val reference: () -> Unit = if (Random.nextBoolean()) {
::fun1
} else {
::fun2
}
takesLambda(reference)
}
return "OK"
}
fun test2(): String {
takesOtherLambda {
val reference: () -> Unit = if (Random.nextBoolean())
::fun1
else
::fun2
takesLambda(reference)
}
return "OK"
}
fun test3(): String {
takesOtherLambda {
val reference: () -> Unit = if (Random.nextBoolean()) {
foo()
::fun1
} else {
foo()
::fun2
}
takesLambda(reference)
}
return "OK"
}
fun box(): String {
return if (test1() == "OK" && test2() == "OK" && test3() == "OK") "OK" else "NOK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -3051,6 +3051,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -3147,6 +3147,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -2673,6 +2673,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@TestMetadata("nested.kt")
public void testNested() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/nested.kt");
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -1989,6 +1989,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -2031,6 +2031,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/testOld/wasm/semantics/IrCodegenBoxWasmTestGenerated.java
Generated
+5
View File
@@ -1813,6 +1813,11 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@TestMetadata("nested.kt")
public void testNested() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/nested.kt");
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+6
View File
@@ -2083,6 +2083,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/callableReference/kt51844.kt");
}
@Test
@TestMetadata("kt52270.kt")
public void testKt52270() throws Exception {
runTest("compiler/testData/codegen/box/callableReference/kt52270.kt");
}
@Test
@TestMetadata("nested.kt")
public void testNested() throws Exception {