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

[minor] ScriptLowering cleanup

Browse Source
This commit is contained in:
Ilya Chernikov
2021-12-06 16:33:25 +01:00
committed by TeamCityServer
parent 1450f4d890
commit e865652602
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.jvm/lower/src/org/jetbrains/kotlin/backend/jvm/lower/ScriptLowering.kt
+12 -3
View File
@@ -25,7 +25,10 @@ import org.jetbrains.kotlin.ir.declarations.impl.IrAnonymousInitializerImpl
import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl import org.jetbrains.kotlin.ir.declarations.impl.IrClassImpl
import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl import org.jetbrains.kotlin.ir.declarations.impl.IrExternalPackageFragmentImpl
import org.jetbrains.kotlin.ir.expressions.* import org.jetbrains.kotlin.ir.expressions.*
import org.jetbrains.kotlin.ir.expressions.impl.* import org.jetbrains.kotlin.ir.expressions.impl.IrClassReferenceImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrGetFieldImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrGetValueImpl
import org.jetbrains.kotlin.ir.expressions.impl.IrInstanceInitializerCallImpl
import org.jetbrains.kotlin.ir.interpreter.toIrConst import org.jetbrains.kotlin.ir.interpreter.toIrConst
import org.jetbrains.kotlin.ir.symbols.* import org.jetbrains.kotlin.ir.symbols.*
import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl import org.jetbrains.kotlin.ir.symbols.impl.IrAnonymousInitializerSymbolImpl
@@ -121,7 +124,14 @@ private class ScriptsToClassesLowering(val context: JvmBackendContext, val inner
private fun finalizeScriptClass(irScriptClass: IrClass, irScript: IrScript, symbolRemapper: ScriptsToClassesSymbolRemapper) { private fun finalizeScriptClass(irScriptClass: IrClass, irScript: IrScript, symbolRemapper: ScriptsToClassesSymbolRemapper) {
val typeRemapper = SimpleTypeRemapper(symbolRemapper) val typeRemapper = SimpleTypeRemapper(symbolRemapper)
val capturingClasses = collectCapturingClasses(irScript) val capturingClasses = collectCapturingClasses(irScript)
val scriptTransformer = ScriptToClassTransformer(irScript, irScriptClass, symbolRemapper, typeRemapper, context, capturingClasses, innerClassesSupport) val scriptTransformer = ScriptToClassTransformer(
irScript,
irScriptClass,
typeRemapper,
context,
capturingClasses,
innerClassesSupport
)
val lambdaPatcher = ScriptFixLambdasTransformer(irScript, irScriptClass, context) val lambdaPatcher = ScriptFixLambdasTransformer(irScript, irScriptClass, context)
irScriptClass.thisReceiver = scriptTransformer.scriptClassReceiver irScriptClass.thisReceiver = scriptTransformer.scriptClassReceiver
@@ -312,7 +322,6 @@ data class ScriptFixLambdasTransformerContext(
private class ScriptToClassTransformer( private class ScriptToClassTransformer(
val irScript: IrScript, val irScript: IrScript,
val irScriptClass: IrClass, val irScriptClass: IrClass,
val symbolRemapper: SymbolRemapper,
val typeRemapper: TypeRemapper, val typeRemapper: TypeRemapper,
val context: JvmBackendContext, val context: JvmBackendContext,
val capturingClasses: Set<IrClassImpl>, val capturingClasses: Set<IrClassImpl>,