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
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
Generated
+54
View File
@@ -23259,6 +23259,42 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
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 {
@@ -23301,6 +23337,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
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 {
@@ -23319,6 +23361,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
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 {
@@ -23331,6 +23379,12 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
Generated
+54
View File
@@ -23409,6 +23409,42 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
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 {
@@ -23451,6 +23487,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
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 {
@@ -23469,6 +23511,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
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 {
@@ -23481,6 +23529,12 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
Generated
+54
View File
@@ -23409,6 +23409,42 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
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 {
@@ -23451,6 +23487,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
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 {
@@ -23469,6 +23511,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
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 {
@@ -23481,6 +23529,12 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
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 {
js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
Generated
+54
View File
@@ -23409,6 +23409,42 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
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 {
@@ -23451,6 +23487,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
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 {
@@ -23469,6 +23511,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
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 {
@@ -23481,6 +23529,12 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
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 {