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

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
@@ -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.
*/
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.generateJsCode
import org.jetbrains.kotlin.ir.backend.js.utils.NameTables
import org.jetbrains.kotlin.ir.descriptors.IrFunctionFactory
import org.jetbrains.kotlin.ir.util.ExternalDependenciesGenerator
import org.jetbrains.kotlin.ir.util.SymbolTable
import org.jetbrains.kotlin.ir.util.generateTypicalIrProviderList
@@ -63,6 +64,10 @@ class JsCoreScriptingCompiler(
val providers = generateTypicalIrProviderList(module, psi2irContext.irBuiltIns, psi2irContext.symbolTable)
val irModuleFragment = psi2ir.generateModuleFragment(psi2irContext, files, providers, emptyList(), null) // TODO: deserializer
psi2irContext.irBuiltIns.let { irBuiltIns ->
irBuiltIns.functionFactory = IrFunctionFactory(irBuiltIns, symbolTable)
}
val context = JsIrBackendContext(
irModuleFragment.descriptor,
psi2irContext.irBuiltIns,