[NI] Fix extension function check after commonization

`isExtensionFunction` property is false for suspend functions
This commit is contained in:
Pavel Kirpichenkov
2020-10-12 17:16:55 +03:00
parent c53011dd04
commit 9dd3d8fb14
9 changed files with 56 additions and 1 deletions
@@ -13334,6 +13334,11 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -0,0 +1,20 @@
// WITH_RUNTIME
// KJS_WITH_FULL_RUNTIME
// !LANGUAGE: +NewInference
class ExtensionReceiver
typealias SuspendExtensionFunction = suspend ExtensionReceiver.() -> Unit
suspend fun ExtensionReceiver.extensionMethod() {}
fun test() {
val map = mutableMapOf<Unit, SuspendExtensionFunction>()
map[Unit] = {
extensionMethod()
}
}
fun box(): String {
test()
return "OK"
}
@@ -14729,6 +14729,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -14729,6 +14729,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -13334,6 +13334,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -680,7 +680,7 @@ interface ClassicTypeSystemContext : TypeSystemInferenceExtensionContext, TypeSy
override fun KotlinTypeMarker.isExtensionFunctionType(): Boolean {
require(this is KotlinType, this::errorMessage)
return this.isExtensionFunctionType
return this.isBuiltinExtensionFunctionalType
}
override fun KotlinTypeMarker.extractArgumentsForFunctionalTypeOrSubtype(): List<KotlinTypeMarker> {
@@ -11434,6 +11434,11 @@ public class IrJsCodegenBoxES6TestGenerated extends AbstractIrJsCodegenBoxES6Tes
runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -11434,6 +11434,11 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");
@@ -11499,6 +11499,11 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
runTest("compiler/testData/codegen/box/inference/referenceToCatchParameterFromLambdaExpression.kt");
}
@TestMetadata("suspendExtensionRecevierFromConstraint.kt")
public void testSuspendExtensionRecevierFromConstraint() throws Exception {
runTest("compiler/testData/codegen/box/inference/suspendExtensionRecevierFromConstraint.kt");
}
@TestMetadata("unsafeVarianceCodegen.kt")
public void testUnsafeVarianceCodegen() throws Exception {
runTest("compiler/testData/codegen/box/inference/unsafeVarianceCodegen.kt");