Improve ETS model (#313)

Author: Lipen

jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonInst.kt

@@ -21,23 +21,19 @@ import org.jacodb.api.common.CommonMethod
 interface CommonInst {
     val location: CommonInstLocation
 
-    // TODO: replace with extension property
     val method: CommonMethod
         get() = location.method
 }
 
 interface CommonInstLocation {
     val method: CommonMethod
-    // val index: Int
-    // val lineNumber: Int
 }
 
 interface CommonAssignInst : CommonInst {
     val lhv: CommonValue
     val rhv: CommonExpr
 }
 
-// TODO: add 'callExpr: CoreExpr' property
 interface CommonCallInst : CommonInst
 
 interface CommonReturnInst : CommonInst {

jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonValue.kt

@@ -23,8 +23,7 @@ interface CommonThis : CommonValue
 interface CommonArgument : CommonValue
 
 interface CommonFieldRef : CommonValue {
-    val instance: CommonValue? // null for static fields
-    // val classField: CommonField
+    val instance: CommonValue?
 }
 
 interface CommonArrayAccess : CommonValue {

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

@@ -109,8 +109,8 @@ class JcBlockGraphImpl(
         (block.start.index..block.end.index).map { jcGraph.instructions[it] }
 
     override fun block(inst: JcInst): JcBasicBlock {
-        assert(inst.location.method == jcGraph.method) {
-            "required method of instruction ${jcGraph.method} but got ${inst.location.method}"
+        assert(inst.method == jcGraph.method) {
+            "required method of instruction ${jcGraph.method} but got ${inst.method}"
         }
         for (basicBlock in entries) {
             if (basicBlock.contains(inst)) {

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

@@ -17,13 +17,8 @@
 package org.jacodb.impl.cfg.graphs
 
 import org.jacodb.api.common.cfg.BytecodeGraph
-import org.jacodb.api.jvm.cfg.JcBasicBlock
-import org.jacodb.api.jvm.cfg.JcBlockGraph
 import org.jacodb.api.jvm.cfg.JcCatchInst
-import org.jacodb.api.jvm.cfg.JcGraph
-import org.jacodb.api.jvm.cfg.JcInst
-import java.util.*
-
+import java.util.BitSet
 
 /**
  * Calculate dominators for basic blocks.
@@ -159,14 +154,6 @@ open class GraphDominators<NODE>(val graph: BytecodeGraph<NODE>) {
     }
 }
 
-fun JcGraph.findDominators(): GraphDominators<JcInst> {
-    return GraphDominators(this).also {
-        it.find()
-    }
-}
-
-fun JcBlockGraph.findDominators(): GraphDominators<JcBasicBlock> {
-    return GraphDominators(this).also {
-        it.find()
-    }
+fun <NODE> BytecodeGraph<NODE>.findDominators(): GraphDominators<NODE> {
+    return GraphDominators(this).also { it.find() }
 }

jacodb-ets/build.gradle.kts

@@ -7,11 +7,11 @@ plugins {
 
 dependencies {
     api(project(":jacodb-api-common"))
-    api(project(":jacodb-core"))
 
     implementation(Libs.kotlin_logging)
     implementation(Libs.slf4j_simple)
     implementation(Libs.kotlinx_serialization_json)
+    implementation(Libs.kotlinx_coroutines_core)
     implementation(Libs.jdot)
 
     testImplementation(kotlin("test"))

jacodb-ets/src/main/kotlin/org/jacodb/ets/base/Position.kt

@@ -26,7 +26,7 @@ data class Block(
 
 data class BlockCfg(
     val blocks: List<Block>,
-    val successors: Map<Int, List<Int>>,
+    val successors: Map<Int, List<Int>>, // for IF stmt, successors are (true, false) branches
 )
 
 fun Program.toBlockCfg(): BlockCfg {