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

[JS scripting] Remove usages of descriptor based APIs and proper support for callable references

Browse Source
This commit is contained in:
Zalim Bashorov
2020-12-25 21:16:50 +03:00
parent 9ac7c3d8bc
commit 0372dae3ce
3 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ScriptRemoveReceiverLowering.kt
+15 -14
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.ir.backend.js.lower
import org.jetbrains.kotlin.backend.common.CommonBackendContext
import org.jetbrains.kotlin.backend.common.FileLoweringPass
import org.jetbrains.kotlin.descriptors.ScriptDescriptor
import org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
@@ -15,10 +14,9 @@ import org.jetbrains.kotlin.ir.expressions.impl.IrConstImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrFunctionReferenceImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrPropertyReferenceImpl
import org.jetbrains.kotlin.ir.symbols.IrClassSymbol
import org.jetbrains.kotlin.ir.types.IrSimpleType
import org.jetbrains.kotlin.ir.types.IrTypeProjection
import org.jetbrains.kotlin.ir.symbols.IrScriptSymbol
import org.jetbrains.kotlin.ir.types.*
import org.jetbrains.kotlin.ir.types.impl.IrSimpleTypeImpl
import org.jetbrains.kotlin.ir.types.makeNullable
import org.jetbrains.kotlin.ir.util.transformFlat
import org.jetbrains.kotlin.ir.visitors.IrElementTransformerVoid
import org.jetbrains.kotlin.ir.visitors.transformChildrenVoid
@@ -37,7 +35,6 @@ class ScriptRemoveReceiverLowering(val context: CommonBackendContext) : FileLowe
private fun IrExpression.nullConst() = IrConstImpl.constNull(startOffset, endOffset, type.makeNullable())
@OptIn(ObsoleteDescriptorBasedAPI::class)
fun lower(script: IrScript): List<IrScript> {
val transformer: IrElementTransformerVoid = object : IrElementTransformerVoid() {
override fun visitCall(expression: IrCall): IrExpression {
@@ -59,6 +56,8 @@ class ScriptRemoveReceiverLowering(val context: CommonBackendContext) : FileLowe
return super.visitFieldAccess(expression)
}
private fun isScript(it: IrTypeArgument) = it.typeOrNull?.classifierOrNull is IrScriptSymbol
override fun visitFunctionReference(expression: IrFunctionReference): IrExpression {
expression.transformChildrenVoid(this)
@@ -66,14 +65,15 @@ class ScriptRemoveReceiverLowering(val context: CommonBackendContext) : FileLowe
expression.dispatchReceiver = null
val result = with(super.visitFunctionReference(expression) as IrFunctionReference) {
val arguments = (type as IrSimpleType).arguments.filter {
!(it is IrTypeProjection && it.type is IrSimpleType && (it.type as IrSimpleType).classifier.descriptor is ScriptDescriptor)
}
// TODO do we really need to fix type or removing dispatchReceiver is enough?
val arguments = (type as IrSimpleType).arguments.filterNot(::isScript)
val newN = arguments.size - 1
IrFunctionReferenceImpl(
startOffset,
endOffset,
IrSimpleTypeImpl(
context.ir.symbols.functionN(arguments.size),
context.ir.symbols.functionN(newN),
(type as IrSimpleType).hasQuestionMark,
arguments,
type.annotations
@@ -102,14 +102,15 @@ class ScriptRemoveReceiverLowering(val context: CommonBackendContext) : FileLowe
expression.dispatchReceiver = null
val result = with(super.visitPropertyReference(expression) as IrPropertyReference) {
val arguments = (type as IrSimpleType).arguments.filter {
!(it is IrTypeProjection && it.type is IrSimpleType && (it.type as IrSimpleType).classifier.descriptor is ScriptDescriptor)
}
// TODO do we really need to fix type or removing dispatchReceiver is enough?
val arguments = (type as IrSimpleType).arguments.filterNot(::isScript)
val newN = arguments.size - 1
IrPropertyReferenceImpl(
startOffset,
endOffset,
IrSimpleTypeImpl(
(if (setter == null) getPropertyN(arguments.size) else getMutablePropertyN(arguments.size)),
(if (setter == null) getPropertyN(newN) else getMutablePropertyN(newN)),
(type as IrSimpleType).hasQuestionMark,
arguments,
type.annotations