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

[JS IR] Generate references from fake override to body in case of generic superclass

Browse Source
This commit is contained in:
Ilya Goncharov
2021-11-03 18:10:49 +03:00
committed by Space
parent 475b3a452e
commit d6112224b4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/JsClassGenerator.kt
+13 -8
View File
@@ -258,17 +258,14 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo
// interface II : I // interface II : I
// II.prototype.foo = I.prototype.foo // II.prototype.foo = I.prototype.foo
if (!irClass.isInterface) { if (!irClass.isInterface) {
val isFakeOverride = declaration.isFakeOverride
val missedOverrides = mutableListOf<IrSimpleFunction>()
declaration.collectRealOverrides() declaration.collectRealOverrides()
.find { it.modality != Modality.ABSTRACT } .onEach {
?.let { if (isFakeOverride && it.modality == Modality.ABSTRACT) {
val implClassDeclaration = it.parent as IrClass missedOverrides.add(it)
if (implClassDeclaration.shouldCopyFrom() && it.body != null) {
val reference = context.getNameForStaticDeclaration(it).makeRef()
classModel.postDeclarationBlock.statements += jsAssignment(memberRef, reference).makeStmt()
} }
} }
declaration.collectRealOverrides()
.find { it.modality != Modality.ABSTRACT } .find { it.modality != Modality.ABSTRACT }
?.let { ?.let {
val implClassDeclaration = it.parent as IrClass val implClassDeclaration = it.parent as IrClass
@@ -276,6 +273,14 @@ class JsClassGenerator(private val irClass: IrClass, val context: JsGenerationCo
if (implClassDeclaration.shouldCopyFrom() && it.body != null) { if (implClassDeclaration.shouldCopyFrom() && it.body != null) {
val reference = context.getNameForStaticDeclaration(it).makeRef() val reference = context.getNameForStaticDeclaration(it).makeRef()
classModel.postDeclarationBlock.statements += jsAssignment(memberRef, reference).makeStmt() classModel.postDeclarationBlock.statements += jsAssignment(memberRef, reference).makeStmt()
if (isFakeOverride) {
classModel.postDeclarationBlock.statements += missedOverrides
.map { missedOverride ->
val name = context.getNameForMemberFunction(missedOverride)
val ref = jsElementAccess(name.ident, classPrototypeRef)
jsAssignment(ref, reference).makeStmt()
}
}
} }
} }
} }
compiler/testData/codegen/box/bridges/fakeOverrideThroughGenericSuperclass.kt
Vendored
-2
View File
@@ -1,8 +1,6 @@
// !LANGUAGE: -AbstractClassMemberNotImplementedWithIntermediateAbstractClass // !LANGUAGE: -AbstractClassMemberNotImplementedWithIntermediateAbstractClass
// IGNORE_BACKEND: WASM // IGNORE_BACKEND: WASM
// WASM_MUTE_REASON: IGNORED_IN_JS // WASM_MUTE_REASON: IGNORED_IN_JS
// IGNORE_BACKEND: JS_IR
// IGNORE_BACKEND: JS_IR_ES6
var result = "Fail" var result = "Fail"