From b76f5547e455fbfab74ce51aba52c51cfa403806 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Mon, 17 May 2021 17:40:48 +0300 Subject: [PATCH] [JS IR] Remove unnecessary overrides in IrNamer --- .../kotlin/ir/backend/js/utils/IrNamerImpl.kt | 51 ------------------- 1 file changed, 51 deletions(-) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrNamerImpl.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrNamerImpl.kt index 72f19b00233..2674710bf3b 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrNamerImpl.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/IrNamerImpl.kt @@ -9,12 +9,7 @@ import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName import org.jetbrains.kotlin.ir.declarations.IrField import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction -import org.jetbrains.kotlin.backend.common.ir.isTopLevel -import org.jetbrains.kotlin.ir.declarations.* -import org.jetbrains.kotlin.ir.expressions.IrLoop -import org.jetbrains.kotlin.ir.util.parentAsClass import org.jetbrains.kotlin.js.backend.ast.JsName -import org.jetbrains.kotlin.js.backend.ast.JsNameRef class IrNamerImpl( private val newNameTables: NameTables, @@ -33,50 +28,4 @@ class IrNamerImpl( require(!field.isStatic) return newNameTables.getNameForMemberField(field).toJsName() } - - override fun getNameForField(field: IrField): JsName { - return if (field.isStatic || field.parent is IrScript) { - getNameForStaticDeclaration(field) - } else { - getNameForMemberField(field) - } - } - - - override fun getNameForClass(klass: IrClass): JsName = - getNameForStaticDeclaration(klass) - - override fun getNameForStaticFunction(function: IrSimpleFunction): JsName = - getNameForStaticDeclaration(function) - - override fun getNameForProperty(property: IrProperty): JsName = - if (property.isTopLevel) getNameForStaticDeclaration(property) else property.getJsNameOrKotlinName().asString().toJsName() - - override fun getRefForExternalClass(klass: IrClass): JsNameRef { - val parent = klass.parent - if (klass.isCompanion) - return getRefForExternalClass(parent as IrClass) - - val currentClassName = if (klass.isTopLevel) getNameForStaticDeclaration(klass).ident else klass.getJsNameOrKotlinName().identifier - return when (parent) { - is IrClass -> - JsNameRef(currentClassName, getRefForExternalClass(parent)) - - is IrPackageFragment -> - JsNameRef(currentClassName) - - else -> - error("Unsupported external class parent $parent") - } - } - - private val associatedObjectKeyMap = mutableMapOf() - - override fun getAssociatedObjectKey(irClass: IrClass): Int? { - if (irClass.isAssociatedObjectAnnotatedAnnotation) { - - return associatedObjectKeyMap.getOrPut(irClass) { associatedObjectKeyMap.size } - } - return null - } }