azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS IR] Cleanup StageController & Lowerings magic a bit

Browse Source
This commit is contained in:
Roman Artemev
2021-12-23 14:36:31 +03:00
committed by teamcity
parent 7341a17a5d
commit 93e7eb2a8e
16 changed files with 62 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/Dce.kt
+24 -33
View File
@@ -33,18 +33,11 @@ fun eliminateDeadDeclarations(
removeUnusedAssociatedObjects: Boolean = true,
) {
val allRoots = context.irFactory.stageController.withInitialIr { buildRoots(modules, context) }
val allRoots = buildRoots(modules, context)
val usefulDeclarations = usefulDeclarations(allRoots, context, removeUnusedAssociatedObjects)
context.irFactory.stageController.unrestrictDeclarationListsAccess {
processUselessDeclarations(
modules,
usefulDeclarations,
context,
removeUnusedAssociatedObjects,
)
}
processUselessDeclarations(modules, usefulDeclarations, context, removeUnusedAssociatedObjects)
}
private fun IrField.isConstant(): Boolean {
@@ -276,32 +269,30 @@ fun usefulDeclarations(
}
// use withInitialIr to avoid ConcurrentModificationException in dce-driven lowering when adding roots' nested declarations (members)
context.irFactory.stageController.withInitialIr {
// Add roots
roots.forEach {
it.enqueue(null, null, altFromFqn = "<ROOT>")
}
// Add roots
roots.forEach {
it.enqueue(null, null, altFromFqn = "<ROOT>")
}
// Add roots' nested declarations
roots.forEach {
it.acceptVoid(
object : IrElementVisitorVoid {
override fun visitElement(element: IrElement) {
element.acceptChildrenVoid(this)
}
override fun visitBody(body: IrBody) {
// Skip
}
override fun visitDeclaration(declaration: IrDeclarationBase) {
if (declaration !== it) declaration.enqueue(it, "roots' nested declaration")
super.visitDeclaration(declaration)
}
// Add roots' nested declarations
roots.forEach {
it.acceptVoid(
object : IrElementVisitorVoid {
override fun visitElement(element: IrElement) {
element.acceptChildrenVoid(this)
}
)
}
override fun visitBody(body: IrBody) {
// Skip
}
override fun visitDeclaration(declaration: IrDeclarationBase) {
if (declaration !== it) declaration.enqueue(it, "roots' nested declaration")
super.visitDeclaration(declaration)
}
}
)
}
val toStringMethod =
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/WholeWorldStageController.kt
+5 -45
View File
@@ -5,8 +5,6 @@
package org.jetbrains.kotlin.ir.backend.js
import org.jetbrains.kotlin.descriptors.DescriptorVisibilities
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.StageController
import org.jetbrains.kotlin.ir.util.IdSignature
@@ -20,8 +18,6 @@ class WholeWorldStageController : StageController() {
override var currentDeclaration: IrDeclaration? = null
private var index: Int = 0
var declarationListsRestricted: Boolean = false
override fun <T> restrictTo(declaration: IrDeclaration, fn: () -> T): T {
val previousCurrentDeclaration = currentDeclaration
val previousIndex = index
@@ -37,56 +33,20 @@ class WholeWorldStageController : StageController() {
}
}
override fun createSignature(parentSignature: IdSignature): IdSignature {
return IdSignature.LoweredDeclarationSignature(parentSignature, currentStage, index++)
}
override fun <T> withStage(stage: Int, fn: () -> T): T {
override fun <T> withInitialIr(block: () -> T): T {
val oldStage = currentStage
currentStage = stage
currentStage = 0
val oldCurrentDeclaration = currentDeclaration
currentDeclaration = null
return try {
fn()
block()
} finally {
currentStage = oldStage
currentDeclaration = oldCurrentDeclaration
}
}
override fun <T> withInitialIr(block: () -> T): T {
return withStage(0) {
declarationRestriction(true, block)
}
}
override fun <T> bodyLowering(fn: () -> T): T {
val wasRestricted = declarationListsRestricted
declarationListsRestricted = true
return try {
fn()
} finally {
declarationListsRestricted = wasRestricted
}
}
override fun <T> unrestrictDeclarationListsAccess(fn: () -> T): T {
return declarationRestriction(false, fn)
}
private fun <T> declarationRestriction(value: Boolean, fn: () -> T): T{
val wasRestricted = declarationListsRestricted
declarationListsRestricted = value
return try {
fn()
} finally {
declarationListsRestricted = wasRestricted
}
}
override fun canAccessDeclarationsOf(irClass: IrClass): Boolean {
return !declarationListsRestricted || irClass.visibility == DescriptorVisibilities.LOCAL/* && irClass !in context.extractedLocalClasses*/
override fun createSignature(parentSignature: IdSignature): IdSignature {
return IdSignature.LoweredDeclarationSignature(parentSignature, currentStage, index++)
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/BlockDecomposerLowering.kt
+1 -3
View File
@@ -72,9 +72,7 @@ abstract class AbstractBlockDecomposerLowering(
val lastStatement = newBody.statements.last()
val actualParent = if (newBody.statements.size > 1 || lastStatement !is IrReturn || lastStatement.value != expression) {
expression = JsIrBuilder.buildCall(initFunction.symbol, expression.type)
context.irFactory.stageController.unrestrictDeclarationListsAccess {
(container.parent as IrDeclarationContainer).declarations += initFunction
}
(container.parent as IrDeclarationContainer).declarations += initFunction
initFunction
} else {
container
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EnumClassLowering.kt
+3 -7
View File
@@ -364,10 +364,8 @@ class EnumClassCreateInitializerLowering(val context: JsCommonBackendContext) :
// TODO Why not move to upper level?
// TODO Also doesn't fit the transformFlat-ish API
context.irFactory.stageController.unrestrictDeclarationListsAccess {
declaration.declarations += entryInstancesInitializedVar
declaration.declarations += initEntryInstancesFun
}
declaration.declarations += entryInstancesInitializedVar
declaration.declarations += initEntryInstancesFun
return null
}
@@ -428,9 +426,7 @@ class EnumEntryCreateGetInstancesFunsLowering(val context: JsCommonBackendContex
// TODO prettify
entryGetInstanceFun.parent = irClass.parent
context.irFactory.stageController.unrestrictDeclarationListsAccess {
(irClass.parent as IrDeclarationContainer).declarations += entryGetInstanceFun
}
(irClass.parent as IrDeclarationContainer).declarations += entryGetInstanceFun
return listOf(declaration) // TODO not null?
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/EscapedIdentifiersLowering.kt
-1
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.config.languageVersionSettings
import org.jetbrains.kotlin.ir.UNDEFINED_OFFSET
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.utils.getJsNameOrKotlinName
import org.jetbrains.kotlin.ir.backend.js.utils.hasStableJsName
import org.jetbrains.kotlin.ir.backend.js.utils.realOverrideTarget
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.expressions.*
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/ExternalEnumUsagesLowering.kt
+5 -6
View File
@@ -10,7 +10,10 @@ import org.jetbrains.kotlin.backend.common.getOrPut
import org.jetbrains.kotlin.ir.backend.js.JsIrBackendContext
import org.jetbrains.kotlin.ir.backend.js.ir.JsIrBuilder
import org.jetbrains.kotlin.ir.builders.declarations.buildField
import org.jetbrains.kotlin.ir.declarations.*
import org.jetbrains.kotlin.ir.declarations.IrClass
import org.jetbrains.kotlin.ir.declarations.IrDeclaration
import org.jetbrains.kotlin.ir.declarations.IrEnumEntry
import org.jetbrains.kotlin.ir.declarations.IrField
import org.jetbrains.kotlin.ir.expressions.IrBody
import org.jetbrains.kotlin.ir.expressions.IrExpression
import org.jetbrains.kotlin.ir.expressions.IrGetEnumValue
@@ -51,10 +54,6 @@ class ExternalEnumUsagesLowering(val context: JsIrBackendContext) : BodyLowering
isStatic = true
}.also {
it.parent = irClass
// TODO need a way to emerge local declarations from BodyLoweringPass
context.irFactory.stageController.unrestrictDeclarationListsAccess {
irClass.declarations += it
}
irClass.declarations += it
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsAnnotationImplementationLowering.kt
+1 -3
View File
@@ -38,9 +38,7 @@ class JsAnnotationImplementationTransformer(val jsContext: JsIrBackendContext) :
override fun visitClassNew(declaration: IrClass): IrStatement {
if (declaration.isAnnotationClass) {
context.irFactory.stageController.unrestrictDeclarationListsAccess {
implementGeneratedFunctions(declaration, declaration)
}
implementGeneratedFunctions(declaration, declaration)
}
return super.visitClassNew(declaration)
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/JsSingleAbstractMethodLowering.kt
+1 -3
View File
@@ -45,9 +45,7 @@ class JsSingleAbstractMethodLowering(context: CommonBackendContext) : SingleAbst
for (wrapper in cachedImplementations.values + inlineCachedImplementations.values) {
val parentClass = wrapper.parent as IrDeclarationContainer
context.irFactory.stageController.unrestrictDeclarationListsAccess {
parentClass.declarations += wrapper
}
parentClass.declarations += wrapper
}
}
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/PrimaryConstructorLowering.kt
+4 -7
View File
@@ -43,13 +43,10 @@ class PrimaryConstructorLowering(val context: JsCommonBackendContext) : Declarat
private val unitType = context.irBuiltIns.unitType
private fun createPrimaryConstructor(irClass: IrClass): IrConstructor {
// TODO better API for declaration creation. This case doesn't fit the usual transformFlat-like API.
val declaration = context.irFactory.stageController.unrestrictDeclarationListsAccess {
irClass.addConstructor {
origin = SYNTHETIC_PRIMARY_CONSTRUCTOR
isPrimary = true
visibility = DescriptorVisibilities.PRIVATE
}
val declaration = irClass.addConstructor {
origin = SYNTHETIC_PRIMARY_CONSTRUCTOR
isPrimary = true
visibility = DescriptorVisibilities.PRIVATE
}
declaration.body = irClass.run {