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

[K2, MPP] Fix actualization of fake overrides (fixes a set of bugs in coroutines / ktor)

Browse Source 
Split MissingFakeOverridesAdder on FakeOverridesActualizer and ActualFakeOverridesAdder

^KT-57984 Fixed
^KT-58003 Fixed
^KT-58124 Fixed
^KT-57833 Fixed
^KT-58153 Fixed
This commit is contained in:
Ivan Kochurkin
2023-04-11 21:41:36 +02:00
committed by Space Team
parent 58f8e25bfe
commit 432c781ff7
39 changed files with 1581 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
Generated
+54
View File
@@ -26499,6 +26499,42 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides2.kt")
public void testExpectActualFakeOverrides2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides3.kt")
public void testExpectActualFakeOverrides3() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters.kt")
public void testExpectActualFakeOverridesWithTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt")
public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride.kt")
public void testExpectActualIntersectionOverride() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride2.kt")
public void testExpectActualIntersectionOverride2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt");
}
@Test
@TestMetadata("expectActualMultiCommon.kt")
public void testExpectActualMultiCommon() throws Exception {
@@ -26547,6 +26583,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt");
}
@Test
@TestMetadata("expectInterfaceInSupertypes2.kt")
public void testExpectInterfaceInSupertypes2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt");
}
@Test
@TestMetadata("expectProperty.kt")
public void testExpectProperty() throws Exception {
@@ -26565,6 +26607,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt");
}
@Test
@TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt")
public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt");
}
@Test
@TestMetadata("kt-56329.kt")
public void testKt_56329() throws Exception {
@@ -26577,6 +26625,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
}
@Test
@TestMetadata("overridesOfExpectMembers.kt")
public void testOverridesOfExpectMembers() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt");
}
@Test
@TestMetadata("removeExpectDeclarationsFromMetadata.kt")
public void testRemoveExpectDeclarationsFromMetadata() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
Generated
+54
View File
@@ -27105,6 +27105,42 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides2.kt")
public void testExpectActualFakeOverrides2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides3.kt")
public void testExpectActualFakeOverrides3() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters.kt")
public void testExpectActualFakeOverridesWithTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt")
public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride.kt")
public void testExpectActualIntersectionOverride() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride2.kt")
public void testExpectActualIntersectionOverride2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt");
}
@Test
@TestMetadata("expectActualMultiCommon.kt")
public void testExpectActualMultiCommon() throws Exception {
@@ -27153,6 +27189,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt");
}
@Test
@TestMetadata("expectInterfaceInSupertypes2.kt")
public void testExpectInterfaceInSupertypes2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt");
}
@Test
@TestMetadata("expectProperty.kt")
public void testExpectProperty() throws Exception {
@@ -27171,6 +27213,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt");
}
@Test
@TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt")
public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt");
}
@Test
@TestMetadata("kt-56329.kt")
public void testKt_56329() throws Exception {
@@ -27183,6 +27231,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
}
@Test
@TestMetadata("overridesOfExpectMembers.kt")
public void testOverridesOfExpectMembers() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt");
}
@Test
@TestMetadata("removeExpectDeclarationsFromMetadata.kt")
public void testRemoveExpectDeclarationsFromMetadata() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
Generated
+54
View File
@@ -26197,6 +26197,42 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides2.kt")
public void testExpectActualFakeOverrides2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides3.kt")
public void testExpectActualFakeOverrides3() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters.kt")
public void testExpectActualFakeOverridesWithTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt")
public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride.kt")
public void testExpectActualIntersectionOverride() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride2.kt")
public void testExpectActualIntersectionOverride2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt");
}
@Test
@TestMetadata("expectActualMultiCommon.kt")
public void testExpectActualMultiCommon() throws Exception {
@@ -26245,6 +26281,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt");
}
@Test
@TestMetadata("expectInterfaceInSupertypes2.kt")
public void testExpectInterfaceInSupertypes2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt");
}
@Test
@TestMetadata("expectProperty.kt")
public void testExpectProperty() throws Exception {
@@ -26263,6 +26305,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt");
}
@Test
@TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt")
public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt");
}
@Test
@TestMetadata("kt-56329.kt")
public void testKt_56329() throws Exception {
@@ -26275,6 +26323,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
}
@Test
@TestMetadata("overridesOfExpectMembers.kt")
public void testOverridesOfExpectMembers() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt");
}
@Test
@TestMetadata("removeExpectDeclarationsFromMetadata.kt")
public void testRemoveExpectDeclarationsFromMetadata() throws Exception {
native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
Generated
+54
View File
@@ -26500,6 +26500,42 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides2.kt")
public void testExpectActualFakeOverrides2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides2.kt");
}
@Test
@TestMetadata("expectActualFakeOverrides3.kt")
public void testExpectActualFakeOverrides3() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverrides3.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters.kt")
public void testExpectActualFakeOverridesWithTypeParameters() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters.kt");
}
@Test
@TestMetadata("expectActualFakeOverridesWithTypeParameters2.kt")
public void testExpectActualFakeOverridesWithTypeParameters2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualFakeOverridesWithTypeParameters2.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride.kt")
public void testExpectActualIntersectionOverride() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride.kt");
}
@Test
@TestMetadata("expectActualIntersectionOverride2.kt")
public void testExpectActualIntersectionOverride2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectActualIntersectionOverride2.kt");
}
@Test
@TestMetadata("expectActualMultiCommon.kt")
public void testExpectActualMultiCommon() throws Exception {
@@ -26548,6 +26584,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes.kt");
}
@Test
@TestMetadata("expectInterfaceInSupertypes2.kt")
public void testExpectInterfaceInSupertypes2() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/expectInterfaceInSupertypes2.kt");
}
@Test
@TestMetadata("expectProperty.kt")
public void testExpectProperty() throws Exception {
@@ -26566,6 +26608,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/independentCommonSourceModules.kt");
}
@Test
@TestMetadata("interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt")
public void testInterfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/interfaceMethodFromSuperTypeIsImplementedInOtherExpectSuperClass.kt");
}
@Test
@TestMetadata("kt-56329.kt")
public void testKt_56329() throws Exception {
@@ -26578,6 +26626,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/nonExternalEquals.kt");
}
@Test
@TestMetadata("overridesOfExpectMembers.kt")
public void testOverridesOfExpectMembers() throws Exception {
runTest("compiler/testData/codegen/box/multiplatform/k2/basic/overridesOfExpectMembers.kt");
}
@Test
@TestMetadata("removeExpectDeclarationsFromMetadata.kt")
public void testRemoveExpectDeclarationsFromMetadata() throws Exception {