From e302f63d9a11e547ad3bc14f42ae8c5c40d3ec52 Mon Sep 17 00:00:00 2001 From: Svyatoslav Kuzmich Date: Thu, 14 Mar 2019 14:35:03 +0300 Subject: [PATCH] [JS IR BE] Remove generateModuleInGlobalScope for code generator This method used to be a workaround for test speedup. Now we use proper close world module with runtime+stdlib module as pre-serialized klib. --- .../transformers/irToJs/IrModuleToJsTransformer.kt | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt index 229918a3c7f..69dcd0b6513 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt @@ -78,16 +78,6 @@ class IrModuleToJsTransformer(private val backendContext: JsIrBackendContext) : .toList() } - private fun generateModuleInGlobalScope(module: IrModuleFragment): JsProgram { - val program = JsProgram() - val rootContext = JsGenerationContext(JsRootScope(program), backendContext) - - val moduleBody = generateModuleBody(module, rootContext) - program.globalBlock.statements += moduleBody - - return program - } - private fun generateModule(module: IrModuleFragment): JsProgram { val program = JsProgram() val rootContext = JsGenerationContext(JsRootScope(program), backendContext) @@ -186,9 +176,7 @@ class IrModuleToJsTransformer(private val backendContext: JsIrBackendContext) : } override fun visitModuleFragment(declaration: IrModuleFragment, data: Nothing?): JsNode = - if (backendContext.compilationMode.generateKlib) generateModuleInGlobalScope(declaration) - else generateModule(declaration) - + generateModule(declaration) private fun processClassModels( classModelMap: Map,