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

Lower priority of captured variables in interpreter

Browse Source
This commit is contained in:
Ivan Kylchik
2021-06-07 23:25:40 +03:00
committed by TeamCityServer
parent 4f3d47eed3
commit 15808cb376
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/ir.interpreter/src/org/jetbrains/kotlin/ir/interpreter/IrInterpreter.kt
+7 -7
View File
@@ -203,16 +203,16 @@ class IrInterpreter private constructor(
irFunction.typeParameters.filter { it.isReified }
.forEach { callStack.addVariable(Variable(it.symbol, KTypeState(call.getTypeArgument(it.index)!!, irBuiltIns.anyClass.owner))) }
// 5. load up values onto stack
if (irFunction.isLocal) callStack.copyUpValuesFromPreviousFrame()
if (dispatchReceiver is StateWithClosure) callStack.loadUpValues(dispatchReceiver)
if (extensionReceiver is StateWithClosure) callStack.loadUpValues(extensionReceiver)
// 6. load outer class object
// 5. load outer class object
if (dispatchReceiver is Complex && irFunction.parentClassOrNull?.isInner == true) {
generateSequence(dispatchReceiver.outerClass) { (it.state as? Complex)?.outerClass }.forEach { callStack.addVariable(it) }
}
// 6. load up values onto stack
if (irFunction.isLocal) callStack.copyUpValuesFromPreviousFrame()
if (dispatchReceiver is StateWithClosure) callStack.loadUpValues(dispatchReceiver)
if (extensionReceiver is StateWithClosure) callStack.loadUpValues(extensionReceiver)
callInterceptor.interceptCall(call, irFunction, args) {
callStack.addInstruction(CompoundInstruction(irFunction))
}
@@ -257,7 +257,6 @@ class IrInterpreter private constructor(
callStack.addInstruction(SimpleInstruction(constructor))
callStack.addVariable(Variable(constructorCall.getThisReceiver(), objectState))
constructor.valueParameters.forEachIndexed { i, param -> callStack.addVariable(Variable(param.symbol, valueArguments[i])) }
if (irClass.isLocal) callStack.loadUpValues(objectState as StateWithClosure)
val superReceiver = when (val irStatement = constructor.body?.statements?.get(0)) {
null -> null // for jvm
@@ -280,6 +279,7 @@ class IrInterpreter private constructor(
// used to get information from outer class
generateSequence(outerClassVar) { (it.state as? Complex)?.outerClass }.forEach { callStack.addVariable(it) }
}
if (irClass.isLocal) callStack.loadUpValues(objectState as StateWithClosure)
callInterceptor.interceptConstructor(constructorCall, valueArguments) {
callStack.addInstruction(CompoundInstruction(constructor))