From 777bb0f0cb7ea2cba607627c590ae861fd08693e Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Fri, 9 Dec 2022 15:39:20 +0100 Subject: [PATCH] [Wasm] Rename Wasm*CodegenContextImpl to Wasm*CodegenContext --- .../jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt | 4 ++-- .../kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt | 6 +++--- .../kotlin/backend/wasm/ir2wasm/TypeTransformer.kt | 2 +- ...nCodegenContextImpl.kt => WasmFunctionCodegenContext.kt} | 4 ++-- ...uleCodegenContextImpl.kt => WasmModuleCodegenContext.kt} | 2 +- .../backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/{WasmFunctionCodegenContextImpl.kt => WasmFunctionCodegenContext.kt} (97%) rename compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/{WasmModuleCodegenContextImpl.kt => WasmModuleCodegenContext.kt} (99%) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt index 465d5c08c30..68342cf3202 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/BodyGenerator.kt @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.wasm.ir.source.location.SourceLocation import org.jetbrains.kotlin.wasm.ir.source.location.withLocation class BodyGenerator( - val context: WasmModuleCodegenContextImpl, - val functionContext: WasmFunctionCodegenContextImpl, + val context: WasmModuleCodegenContext, + val functionContext: WasmFunctionCodegenContext, private val hierarchyDisjointUnions: DisjointUnions, private val isGetUnitFunction: Boolean, ) : IrElementVisitorVoid { diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt index 256a3fd79ee..49ca7a68e9d 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/DeclarationGenerator.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.name.parentOrNull import org.jetbrains.kotlin.wasm.ir.* class DeclarationGenerator( - val context: WasmModuleCodegenContextImpl, + val context: WasmModuleCodegenContext, private val allowIncompleteImplementations: Boolean, private val hierarchyDisjointUnions: DisjointUnions, ) : IrElementVisitorVoid { @@ -115,7 +115,7 @@ class DeclarationGenerator( } val function = WasmFunction.Defined(watName, functionTypeSymbol) - val functionCodegenContext = WasmFunctionCodegenContextImpl( + val functionCodegenContext = WasmFunctionCodegenContext( declaration, function, backendContext, @@ -477,7 +477,7 @@ fun IrFunction.isExported(): Boolean = isJsExport() -fun generateConstExpression(expression: IrConst<*>, body: WasmExpressionBuilder, context: WasmModuleCodegenContextImpl) { +fun generateConstExpression(expression: IrConst<*>, body: WasmExpressionBuilder, context: WasmModuleCodegenContext) { when (val kind = expression.kind) { is IrConstKind.Null -> { val bottomType = if (expression.type.getClass()?.isExternal == true) WasmRefNullExternrefType else WasmRefNullNoneType diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt index b1e97928536..69dcf0009b4 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/TypeTransformer.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.wasm.ir.* class WasmTypeTransformer( - val context: WasmModuleCodegenContextImpl, + val context: WasmModuleCodegenContext, val builtIns: IrBuiltIns ) { val symbols = context.backendContext.wasmSymbols diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt similarity index 97% rename from compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt rename to compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt index edb0f65f574..e38936b6873 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContextImpl.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmFunctionCodegenContext.kt @@ -17,11 +17,11 @@ import org.jetbrains.kotlin.wasm.ir.* enum class LoopLabelType { BREAK, CONTINUE } enum class SyntheticLocalType { IS_INTERFACE_PARAMETER, TABLE_SWITCH_SELECTOR } -class WasmFunctionCodegenContextImpl( +class WasmFunctionCodegenContext( val irFunction: IrFunction, private val wasmFunction: WasmFunction.Defined, val backendContext: WasmBackendContext, - val context: WasmModuleCodegenContextImpl, + val context: WasmModuleCodegenContext, ) { val bodyGen: WasmExpressionBuilder = WasmIrExpressionBuilder(wasmFunction.instructions) diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt similarity index 99% rename from compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt rename to compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt index 7cd22b0f7dc..44559deda3a 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContextImpl.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleCodegenContext.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.ir.types.isNothing import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.wasm.ir.* -class WasmModuleCodegenContextImpl( +class WasmModuleCodegenContext( val backendContext: WasmBackendContext, private val wasmFragment: WasmCompiledModuleFragment ) { diff --git a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt index f068b9a4cb5..74be074c2d5 100644 --- a/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt +++ b/compiler/ir/backend.wasm/src/org/jetbrains/kotlin/backend/wasm/ir2wasm/WasmModuleFragmentGenerator.kt @@ -27,7 +27,7 @@ class WasmModuleFragmentGenerator( private val declarationGenerator = DeclarationGenerator( - WasmModuleCodegenContextImpl( + WasmModuleCodegenContext( backendContext, wasmModuleFragment, ),