[JS IC] fix cross-module nested class references and interface inheritance

^ KT-50528 fixed
This commit is contained in:
Anton Bannykh
2021-12-28 13:44:05 +03:00
committed by teamcity
parent 3fe05233e2
commit 1b631da3a0
7 changed files with 74 additions and 4 deletions
@@ -99,7 +99,7 @@ fun compileWithIC(
module.files.filter { it.fileEntry.name in dirties }
} ?: module.files
val ast = transformer.generateBinaryAst(dirtyFiles)
val ast = transformer.generateBinaryAst(dirtyFiles, allModules)
ast.entries.forEach { (path, bytes) -> cacheConsumer.commitBinaryAst(path, bytes) }
}
@@ -104,14 +104,18 @@ class IrModuleToJsTransformerTmp(
return CompilerResult(result, dts)
}
fun generateBinaryAst(files: Iterable<IrFile>): Map<String, ByteArray> {
fun generateBinaryAst(files: Iterable<IrFile>, allModules: Iterable<IrModuleFragment>): Map<String, ByteArray> {
val exportModelGenerator = ExportModelGenerator(backendContext, generateNamespacesForPackages = true)
val exportData = files.associate { file ->
file to exportModelGenerator.generateExportWithExternals(file)
}
files.forEach { StaticMembersLowering(backendContext).lower(it) }
allModules.forEach {
it.files.forEach {
StaticMembersLowering(backendContext).lower(it)
}
}
val serializer = JsIrAstSerializer()
@@ -301,7 +301,7 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo
?.let {
val implClassDeclaration = it.parent as IrClass
if (implClassDeclaration.shouldCopyFrom() && it.body != null) {
if (implClassDeclaration.shouldCopyFrom()) {
val reference = context.getNameForStaticDeclaration(it).makeRef()
classModel.postDeclarationBlock.statements += jsAssignment(memberRef, reference).makeStmt()
if (isFakeOverride) {
@@ -4210,6 +4210,12 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
runTest("js/js.translator/testData/box/incremental/inlineSuspendFun.kt");
}
@Test
@TestMetadata("interfaceInheritanceCrossModule.kt")
public void testInterfaceInheritanceCrossModule() throws Exception {
runTest("js/js.translator/testData/box/incremental/interfaceInheritanceCrossModule.kt");
}
@Test
@TestMetadata("jsModule.kt")
public void testJsModule() throws Exception {
@@ -4228,6 +4234,12 @@ public class BoxJsTestGenerated extends AbstractBoxJsTest {
runTest("js/js.translator/testData/box/incremental/multipleReimport.kt");
}
@Test
@TestMetadata("nestedClassesInDependency.kt")
public void testNestedClassesInDependency() throws Exception {
runTest("js/js.translator/testData/box/incremental/nestedClassesInDependency.kt");
}
@Test
@TestMetadata("packagesWithSameName.kt")
public void testPackagesWithSameName() throws Exception {
@@ -4582,6 +4582,12 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
runTest("js/js.translator/testData/box/incremental/inlineSuspendFun.kt");
}
@Test
@TestMetadata("interfaceInheritanceCrossModule.kt")
public void testInterfaceInheritanceCrossModule() throws Exception {
runTest("js/js.translator/testData/box/incremental/interfaceInheritanceCrossModule.kt");
}
@Test
@TestMetadata("jsModule.kt")
public void testJsModule() throws Exception {
@@ -4600,6 +4606,12 @@ public class IrBoxJsTestGenerated extends AbstractIrBoxJsTest {
runTest("js/js.translator/testData/box/incremental/multipleReimport.kt");
}
@Test
@TestMetadata("nestedClassesInDependency.kt")
public void testNestedClassesInDependency() throws Exception {
runTest("js/js.translator/testData/box/incremental/nestedClassesInDependency.kt");
}
@Test
@TestMetadata("packagesWithSameName.kt")
public void testPackagesWithSameName() throws Exception {
@@ -0,0 +1,27 @@
// NO_COMMON_FILES
// MODULE: lib
// FILE: lib.kt
package lib
interface A {
fun foo() = 23
}
// MODULE: main(lib)
// FILE: main.kt
// RECOMPILE
package main
import lib.A
class B : A {
fun bar() = foo() + 1
}
fun box(): String {
val result = B().bar()
if (result != 24) return "fail: $result"
return "OK"
}
@@ -0,0 +1,15 @@
// NO_COMMON_FILES
// MODULE: lib
// FILE: lib.kt
class A {
class B(val msg: String)
fun foo(b: B) = b.msg
}
// MODULE: main(lib)
// FILE: main.kt
// RECOMPILE
fun box() = A().foo(A.B("OK"))