More fixes

Now coroutines are green

Author: DaniilStepanov

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/MethodNodeBuilder.kt

@@ -253,11 +253,13 @@ class MethodNodeBuilder(
         var shouldReverse = false
         val (zeroValue, zeroCmpOpcode, defaultOpcode) = when (cond) {
             is JcRawEqExpr -> when {
+                cond.lhv.typeName == PredefinedPrimitives.Null.typeName() -> Triple(JcRawNull(), Opcodes.IFNULL, Opcodes.IF_ACMPEQ)
                 cond.lhv.typeName.isPrimitive -> Triple(JcRawInt(0), Opcodes.IFEQ, Opcodes.IF_ICMPEQ)
                 else -> Triple(JcRawNull(), Opcodes.IFNULL, Opcodes.IF_ACMPEQ)
             }
 
             is JcRawNeqExpr -> when {
+                cond.lhv.typeName == PredefinedPrimitives.Null.typeName() -> Triple(JcRawNull(), Opcodes.IFNONNULL, Opcodes.IF_ACMPNE)
                 cond.lhv.typeName.isPrimitive -> Triple(JcRawInt(0), Opcodes.IFNE, Opcodes.IF_ICMPNE)
                 else -> Triple(JcRawNull(), Opcodes.IFNONNULL, Opcodes.IF_ACMPNE)
             }

jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/RawInstListBuilder.kt

@@ -211,27 +211,6 @@ class RawInstListBuilder(
         return Simplifier().simplify(method.enclosingClass.classpath, localsNormalizedInstructionList)
     }
 
-    fun insnToString(insn: AbstractInsnNode): String {
-        insn.accept(mp)
-        val sw = StringWriter()
-        printer.print(PrintWriter(sw))
-        printer.getText().clear()
-        return sw.toString()
-    }
-
-    private val printer: Printer = Textifier()
-    private val mp = TraceMethodVisitor(printer)
-
-    fun printMethod(methodNode: MethodNode): String {
-        val inList = methodNode.instructions;
-        var s = ""
-        s += methodNode.name + "\n"
-        for (i in 0 until methodNode.instructions.size()) {
-            s += insnToString(inList.get(i))
-        }
-        return s
-    }
-
     private fun buildInstructions() {
         currentFrame = createInitialFrame()
         frames[ENTRY] = currentFrame
@@ -1084,6 +1063,11 @@ class RawInstListBuilder(
 
             push(throwable)
         }
+        var curNode: AbstractInsnNode = insnNode
+        while (curNode !is LabelNode) {
+            curNode = curNode.previous
+            frames[curNode] = currentFrame
+        }
     }
 
     private fun buildIincInsnNode(insnNode: IincInsnNode) {