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

JVM: use various Interpreter.new* methods in FastMethodAnalyzer

Browse Source 
These allow e.g. specifying different values for parameters depending on
their indices.
This commit is contained in:
pyos
2022-04-27 14:40:31 +02:00
committed by Mikhael Bogdanov
parent de875f6349
commit 51dbc60722
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/common/FastMethodAnalyzer.kt
+12 -8
View File
@@ -132,7 +132,7 @@ open class FastMethodAnalyzer<V : Value>
handler.init(f) handler.init(f)
handler.clearStack() handler.clearStack()
handler.push(interpreter.newValue(exnType)) handler.push(interpreter.newExceptionValue(tcb, handler, exnType))
mergeControlFlowEdge(jump, handler) mergeControlFlowEdge(jump, handler)
} }
} }
@@ -157,21 +157,25 @@ open class FastMethodAnalyzer<V : Value>
} }
internal fun initLocals(current: Frame<V>) { internal fun initLocals(current: Frame<V>) {
current.setReturn(interpreter.newValue(Type.getReturnType(method.desc))) current.setReturn(interpreter.newReturnTypeValue(Type.getReturnType(method.desc)))
val args = Type.getArgumentTypes(method.desc) val args = Type.getArgumentTypes(method.desc)
var local = 0 var local = 0
if ((method.access and Opcodes.ACC_STATIC) == 0) { val isInstanceMethod = (method.access and Opcodes.ACC_STATIC) == 0
val ctype = Type.getObjectType(owner) if (isInstanceMethod) {
current.setLocal(local++, interpreter.newValue(ctype)) current.setLocal(local, interpreter.newParameterValue(true, local, Type.getObjectType(owner)))
local++
} }
for (arg in args) { for (arg in args) {
current.setLocal(local++, interpreter.newValue(arg)) current.setLocal(local, interpreter.newParameterValue(isInstanceMethod, local, arg))
local++
if (arg.size == 2) { if (arg.size == 2) {
current.setLocal(local++, interpreter.newValue(null)) current.setLocal(local, interpreter.newEmptyValue(local))
local++
} }
} }
while (local < method.maxLocals) { while (local < method.maxLocals) {
current.setLocal(local++, interpreter.newValue(null)) current.setLocal(local, interpreter.newEmptyValue(local))
local++
} }
} }