From 89d3060e0040945cc86306e2c9f32b33f579688e Mon Sep 17 00:00:00 2001 From: Alexander Korepanov Date: Tue, 27 Sep 2022 14:29:11 +0200 Subject: [PATCH] [JS IR] Drop unused JsRecordExtractedLocalClasses logic --- .../ir/backend/js/JsIrBackendContext.kt | 1 - .../kotlin/ir/backend/js/JsLoweringPhases.kt | 4 +-- .../inline/JsRecordExtractedLocalClasses.kt | 32 ------------------- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/JsRecordExtractedLocalClasses.kt diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt index c9086e3a8bc..19b6e4b9c39 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsIrBackendContext.kt @@ -82,7 +82,6 @@ class JsIrBackendContext( val fieldToInitializer: MutableMap = mutableMapOf() val localClassNames: MutableMap = mutableMapOf() - val extractedLocalClasses: MutableSet = hashSetOf() val minimizedNameGenerator: MinimizedNameGenerator = MinimizedNameGenerator() diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt index 8b0e6493c7e..7d229987ba6 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/JsLoweringPhases.kt @@ -236,7 +236,7 @@ private val localClassesInInlineFunctionsPhase = makeBodyLoweringPhase( ) private val localClassesExtractionFromInlineFunctionsPhase = makeBodyLoweringPhase( - { context -> LocalClassesExtractionFromInlineFunctionsLowering(context, BackendContext::jsRecordExtractedLocalClasses) }, + { context -> LocalClassesExtractionFromInlineFunctionsLowering(context) }, name = "localClassesExtractionFromInlineFunctionsPhase", description = "Move local classes from inline functions into nearest declaration container", prerequisite = setOf(localClassesInInlineFunctionsPhase) @@ -459,7 +459,7 @@ private val localDeclarationsLoweringPhase = makeBodyLoweringPhase( ) private val localClassExtractionPhase = makeBodyLoweringPhase( - { context -> LocalClassPopupLowering(context, BackendContext::jsRecordExtractedLocalClasses) }, + { context -> LocalClassPopupLowering(context) }, name = "LocalClassExtractionPhase", description = "Move local declarations into nearest declaration container", prerequisite = setOf(localDeclarationsLoweringPhase) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/JsRecordExtractedLocalClasses.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/JsRecordExtractedLocalClasses.kt deleted file mode 100644 index 8c66f3158d2..00000000000 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/inline/JsRecordExtractedLocalClasses.kt +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2010-2021 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. - */ - -package org.jetbrains.kotlin.ir.backend.js.lower.inline - -import org.jetbrains.kotlin.backend.common.BackendContext -import org.jetbrains.kotlin.ir.IrElement -import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext -import org.jetbrains.kotlin.ir.declarations.IrClass -import org.jetbrains.kotlin.ir.expressions.IrBody -import org.jetbrains.kotlin.ir.visitors.IrElementVisitorVoid -import org.jetbrains.kotlin.ir.visitors.acceptChildrenVoid -import org.jetbrains.kotlin.ir.visitors.acceptVoid - -fun BackendContext.jsRecordExtractedLocalClasses(irClass: IrClass) { - val context = this as JsIrBackendContext - irClass.acceptVoid(object : IrElementVisitorVoid { - override fun visitElement(element: IrElement) { - element.acceptChildrenVoid(this) - } - - override fun visitBody(body: IrBody) { - } - - override fun visitClass(declaration: IrClass) { - super.visitClass(declaration) - context.extractedLocalClasses += declaration - } - }) -}