jlengrand/kotlin
1
0
Fork 0
mirror of https://github.com/jlengrand/kotlin.git synced 2026-03-10 08:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create DONT_CARE type only for dependent lambdas (i.e. to be resolved through the type inference later)

Browse Source 
^KT-47493 Fixed
This commit is contained in:
Victor Petukhov
2021-08-06 10:13:35 +03:00
committed by teamcityserver
parent dbdc6176f0
commit 1966915e92
9 changed files with 58 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirBlackBoxCodegenTestGenerated.java generated
View File

@@ -16610,6 +16610,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@Test
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@Test
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {

2
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java
View File

@@ -394,7 +394,7 @@ public class ExpressionTypingServices {
return blockLevelVisitor.getTypeInfo(statementExpression, context.replaceExpectedType(expectedType), true);
}
if (KtPsiUtil.deparenthesize(statementExpression) instanceof KtLambdaExpression) {
if (KtPsiUtil.deparenthesize(statementExpression) instanceof KtLambdaExpression && context.contextDependency == ContextDependency.DEPENDENT) {
KotlinTypeInfo typeInfo = createDontCareTypeInfoForNILambda(statementExpression, context);
if (typeInfo != null) return typeInfo;
}

19
compiler/testData/codegen/box/functions/kt48058.kt vendored Normal file
View File

@@ -0,0 +1,19 @@
// DONT_TARGET_EXACT_BACKEND: WASM
fun doCall(block: Any ):Int {
(block as () -> Unit)()
return 1
}
fun test1() =
doCall {
try {}
finally {
{}
}
}
fun box(): String {
test1()
return "OK"
}

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java generated
View File

@@ -16490,6 +16490,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@Test
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@Test
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {

6
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java generated
View File

@@ -16610,6 +16610,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@Test
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@Test
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {

5
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java generated
View File

@@ -13614,6 +13614,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt785.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/es6/semantics/IrJsCodegenBoxES6TestGenerated.java generated
View File

@@ -11983,6 +11983,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt785.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/semantics/IrJsCodegenBoxTestGenerated.java generated
View File

@@ -11389,6 +11389,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt785.kt");

5
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/semantics/JsCodegenBoxTestGenerated.java generated
View File

@@ -11389,6 +11389,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/functions/kt47527.kt");
}
@TestMetadata("kt48058.kt")
public void testKt48058() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt48058.kt");
}
@TestMetadata("kt785.kt")
public void testKt785() throws Exception {
runTest("compiler/testData/codegen/box/functions/kt785.kt");