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

Substitute captured types with inner intersection one (NewTypeSubstitutor)

Browse Source 
^KT-44651 Fixed
This commit is contained in:
Victor Petukhov
2021-02-09 12:58:53 +03:00
parent 80daf120e6
commit f797ee7803
6 changed files with 39 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
@@ -16666,6 +16666,12 @@ public class FirBlackBoxCodegenTestGenerated extends AbstractFirBlackBoxCodegenT
runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
}
@Test
@TestMetadata("substituteIntersectionTypeInsideCapType.kt")
public void testSubstituteIntersectionTypeInsideCapType() throws Exception {
runTest("compiler/testData/codegen/box/inference/substituteIntersectionTypeInsideCapType.kt");
}
@Test
@TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt
+1 -1
View File
@@ -105,7 +105,7 @@ interface NewTypeSubstitutor : TypeSubstitutorMarker {
val substitutedInnerType = substitute(innerType, keepAnnotation, runCapturedChecks = false)
if (substitutedInnerType != null) {
if (innerType is StubType || substitutedInnerType is StubType) {
if (innerType is StubType || substitutedInnerType is StubType || innerType.constructor is IntersectionTypeConstructor) {
return NewCapturedType(
capturedType.captureStatus,
NewCapturedTypeConstructor(
compiler/testData/codegen/box/inference/substituteIntersectionTypeInsideCapType.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// TARGET_BACKEND: JVM
// TARGET_BACKEND: JVM_IR
class X<T: Number>(val y: Any, val x: T)
fun box(): String {
val num: Long = -10
val num2: Int = 20
val obj = if (true)
X(Any(), if (true) num else num2)
else
X(Any(), -25)
val f = obj.y
return "OK"
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16666,6 +16666,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
}
@Test
@TestMetadata("substituteIntersectionTypeInsideCapType.kt")
public void testSubstituteIntersectionTypeInsideCapType() throws Exception {
runTest("compiler/testData/codegen/box/inference/substituteIntersectionTypeInsideCapType.kt");
}
@Test
@TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
Generated
+6
View File
@@ -16666,6 +16666,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
}
@Test
@TestMetadata("substituteIntersectionTypeInsideCapType.kt")
public void testSubstituteIntersectionTypeInsideCapType() throws Exception {
runTest("compiler/testData/codegen/box/inference/substituteIntersectionTypeInsideCapType.kt");
}
@Test
@TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
Generated
+5
View File
@@ -13855,6 +13855,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
runTest("compiler/testData/codegen/box/inference/specialCallsWithCallableReferences.kt");
}
@TestMetadata("substituteIntersectionTypeInsideCapType.kt")
public void testSubstituteIntersectionTypeInsideCapType() throws Exception {
runTest("compiler/testData/codegen/box/inference/substituteIntersectionTypeInsideCapType.kt");
}
@TestMetadata("subtypingOfIntersectionIltInsideFlexible.kt")
public void testSubtypingOfIntersectionIltInsideFlexible() throws Exception {
runTest("compiler/testData/codegen/box/inference/subtypingOfIntersectionIltInsideFlexible.kt");