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

Extract ir function interpretation in separate method

Browse Source 
This modification will be used to get exception stack trace
This commit is contained in:
Ivan Kylchik
2019-12-11 00:59:38 +03:00
parent f99829ce5e
commit c4cc858b84
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/interpreter/IrInterpreter.kt
+9 -4
View File
@@ -40,6 +40,7 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns) {
private fun IrElement.interpret(data: Frame): Code { private fun IrElement.interpret(data: Frame): Code {
try { try {
val code = when (this) { val code = when (this) {
is IrFunctionImpl -> interpretFunction(this, data)
is IrCall -> interpretCall(this, data) is IrCall -> interpretCall(this, data)
is IrConstructorCall -> interpretConstructorCall(this, data) is IrConstructorCall -> interpretConstructorCall(this, data)
is IrDelegatingConstructorCall -> interpretDelegatedConstructorCall(this, data) is IrDelegatingConstructorCall -> interpretDelegatedConstructorCall(this, data)
@@ -86,6 +87,11 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns) {
} }
} }
// this method is used to get stack trace after exception
private fun interpretFunction(irFunction: IrFunctionImpl, data: Frame): Code {
return irFunction.body?.interpret(data) ?: throw AssertionError("Ir function must be with body")
}
private fun calculateAbstract(irFunction: IrFunction, data: Frame): Code { private fun calculateAbstract(irFunction: IrFunction, data: Frame): Code {
if (irFunction.body == null) { if (irFunction.body == null) {
val receiver = data.getVariableState(irFunction.symbol.getReceiver()!!) as Complex val receiver = data.getVariableState(irFunction.symbol.getReceiver()!!) as Complex
@@ -97,7 +103,7 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns) {
val newFrame = InterpreterFrame() val newFrame = InterpreterFrame()
newFrame.addVar(Variable(functionImplementation.symbol.getReceiver()!!, instance)) newFrame.addVar(Variable(functionImplementation.symbol.getReceiver()!!, instance))
newFrame.addAll(arguments) newFrame.addAll(arguments)
return functionImplementation.body!!.interpret(newFrame).apply { data.pushReturnValue(newFrame) } return functionImplementation.interpret(newFrame).apply { data.pushReturnValue(newFrame) }
} }
return irFunction.body!!.interpret(data) return irFunction.body!!.interpret(data)
} }
@@ -113,9 +119,8 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns) {
newStates.addVar(Variable(overridden.getReceiver()!!, superQualifier)) newStates.addVar(Variable(overridden.getReceiver()!!, superQualifier))
val overriddenOwner = overridden.owner as IrFunctionImpl val overriddenOwner = overridden.owner as IrFunctionImpl
val body = overriddenOwner.body
return when { return when {
body != null -> body.interpret(newStates) overriddenOwner.body != null -> overriddenOwner.interpret(newStates)
else -> calculateOverridden(overriddenOwner, newStates) else -> calculateOverridden(overriddenOwner, newStates)
}.apply { data.pushReturnValue(newStates) } }.apply { data.pushReturnValue(newStates) }
} }
@@ -227,7 +232,7 @@ class IrInterpreter(private val irBuiltIns: IrBuiltIns) {
irFunction.isAbstract() -> calculateAbstract(irFunction, newFrame) //abstract check must be before fake overridden check irFunction.isAbstract() -> calculateAbstract(irFunction, newFrame) //abstract check must be before fake overridden check
irFunction.isFakeOverridden() -> calculateOverridden(irFunction as IrFunctionImpl, newFrame) irFunction.isFakeOverridden() -> calculateOverridden(irFunction as IrFunctionImpl, newFrame)
irFunction.body == null -> calculateBuiltIns(irFunction, newFrame) irFunction.body == null -> calculateBuiltIns(irFunction, newFrame)
else -> irFunction.body!!.interpret(newFrame) else -> irFunction.interpret(newFrame)
} }
data.pushReturnValue(newFrame) data.pushReturnValue(newFrame)
return code return code