Eval4j: initialize frame with local variables values using type size

#KT-5133 Fixed
2014-05-30 12:00:08 +04:00
parent 2077604d6d
commit 250b9b500b
1 changed files with 8 additions and 4 deletions
@@ -33,14 +33,18 @@ fun makeInitialFrame(methodNode: MethodNode, arguments: List<Value>): Frame<Valu
    val frame = Frame<Value>(methodNode.maxLocals, methodNode.maxStack)
    frame.setReturn(makeNotInitializedValue(Type.getReturnType(methodNode.desc)))

+    var index = 0
    for ((i, arg) in arguments.withIndices()) {
-        frame.setLocal(i, arg)
+        frame.setLocal(index++, arg)
+        if (arg.getSize() == 2) {
+            frame.setLocal(index++, NOT_A_VALUE)
+        }
    }

-    for (i in arguments.size..methodNode.maxLocals - 1) {
-        frame.setLocal(i, NOT_A_VALUE)
+    while (index < methodNode.maxLocals) {
+        frame.setLocal(index++, NOT_A_VALUE)
    }
-    
+
    return frame
 }