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

[JS IR BE] Fix traits super calls

Browse Source
This commit is contained in:
Roman Artemev
2019-01-14 16:59:44 +03:00
committed by romanart
parent af964d56c7
commit fd9a72b627
1 changed files with 7 additions and 4 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/IrElementToJsExpressionTransformer.kt
+7 -4
View File
@@ -14,8 +14,7 @@ import org.jetbrains.kotlin.ir.declarations.IrConstructor
import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction
import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.types.IrDynamicType import org.jetbrains.kotlin.ir.types.IrDynamicType
import org.jetbrains.kotlin.ir.util.isFunctionTypeOrSubtype import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.ir.util.parentAsClass
import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.util.OperatorNameConventions import org.jetbrains.kotlin.util.OperatorNameConventions
@@ -137,8 +136,12 @@ class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer<JsEx
} }
expression.superQualifierSymbol?.let { expression.superQualifierSymbol?.let {
val qualifierName = context.getNameForSymbol(it).makeRef() val (target, owner) = if (it.owner.isInterface) {
val targetName = context.getNameForSymbol(symbol) val impl = (symbol.owner as IrSimpleFunction).resolveFakeOverride()!!
Pair(impl, impl.parentAsClass)
} else Pair(symbol.owner, it.owner)
val qualifierName = context.getNameForSymbol(owner.symbol).makeRef()
val targetName = context.getNameForSymbol(target.symbol)
val qPrototype = JsNameRef(targetName, prototypeOf(qualifierName)) val qPrototype = JsNameRef(targetName, prototypeOf(qualifierName))
val callRef = JsNameRef(Namer.CALL_FUNCTION, qPrototype) val callRef = JsNameRef(Namer.CALL_FUNCTION, qPrototype)
return JsInvocation(callRef, jsDispatchReceiver?.let { listOf(it) + arguments } ?: arguments) return JsInvocation(callRef, jsDispatchReceiver?.let { listOf(it) + arguments } ?: arguments)