[Wasm] Support WASI target in K2

- Support WASI mode in CLI and test infrastructure
- Add external declaration checker
- Split Fir diagnostic lists into Base, JS and WASI

#KT-56849 Fixed
This commit is contained in:
Svyatoslav Kuzmich
2023-11-22 15:57:51 +01:00
committed by Space Team
parent f26b0a5be6
commit e901629cf0
20 changed files with 216 additions and 27 deletions
@@ -13,10 +13,9 @@ import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.jvm.checkers.JvmTypeCheckers
import org.jetbrains.kotlin.fir.analysis.native.checkers.NativeDeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.native.checkers.NativeExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.WasmDeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.WasmExpressionCheckers
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.WasmTypeCheckers
import org.jetbrains.kotlin.fir.analysis.wasm.checkers.*
import org.jetbrains.kotlin.fir.session.FirSessionConfigurator
import org.jetbrains.kotlin.js.config.WasmTarget
fun FirSessionConfigurator.registerCommonCheckers() {
useCheckers(CommonDeclarationCheckers)
@@ -48,8 +47,18 @@ fun FirSessionConfigurator.registerNativeCheckers() {
useCheckers(NativeExpressionCheckers)
}
fun FirSessionConfigurator.registerWasmCheckers() {
useCheckers(WasmDeclarationCheckers)
useCheckers(WasmExpressionCheckers)
useCheckers(WasmTypeCheckers)
fun FirSessionConfigurator.registerWasmCheckers(target: WasmTarget) {
useCheckers(WasmBaseDeclarationCheckers)
useCheckers(WasmBaseExpressionCheckers)
useCheckers(WasmBaseTypeCheckers)
when (target) {
WasmTarget.JS -> {
useCheckers(WasmJsDeclarationCheckers)
useCheckers(WasmJsExpressionCheckers)
}
WasmTarget.WASI -> {
useCheckers(WasmWasiDeclarationCheckers)
}
}
}
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.resolve.providers.impl.FirBuiltinSyntheticFuncti
import org.jetbrains.kotlin.fir.scopes.FirKotlinScopeProvider
import org.jetbrains.kotlin.fir.session.FirSessionFactoryHelper.registerDefaultComponents
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.js.config.WasmTarget
import org.jetbrains.kotlin.library.KotlinLibrary
import org.jetbrains.kotlin.name.Name
@@ -27,6 +28,7 @@ object FirWasmSessionFactory : FirAbstractSessionFactory() {
sessionProvider: FirProjectSessionProvider,
extensionRegistrars: List<FirExtensionRegistrar>,
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
wasmTarget: WasmTarget,
lookupTracker: LookupTracker?,
icData: KlibIcData? = null,
registerExtraComponents: ((FirSession) -> Unit) = {},
@@ -45,7 +47,7 @@ object FirWasmSessionFactory : FirAbstractSessionFactory() {
it.registerDefaultComponents()
registerExtraComponents(it)
},
registerExtraCheckers = { it.registerWasmCheckers() },
registerExtraCheckers = { it.registerWasmCheckers(wasmTarget) },
createKotlinScopeProvider = { FirKotlinScopeProvider { _, declaredMemberScope, _, _, _ -> declaredMemberScope } },
createProviders = { session, kotlinScopeProvider, symbolProvider, generatedSymbolsProvider, dependencies ->
listOfNotNull(