Skip to content

Change ETS model #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Apr 17, 2025
Merged

Change ETS model #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3efaff
Improve ETS model
Lipen Apr 16, 2025
9ac136f
Restore types in the ETS code model
Lipen Apr 16, 2025
70a0f5e
Suppress
Lipen Apr 17, 2025
e11a0e3
Remove unnecessary commented code
Lipen Apr 17, 2025
a923dad
Remove custom equals for EtsStmtLocation
Lipen Apr 17, 2025
ebe7621
Remove unnecessary code
Lipen Apr 17, 2025
8e94521
Remove commented code
Lipen Apr 17, 2025
fdbbbfa
Remove deprecate
Lipen Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonInst.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 1 addition & 2 deletions jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg/CommonValue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/JcBlockGraphImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
(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}"

Check warning on line 113 in jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/JcBlockGraphImpl.kt

View check run for this annotation

Codecov / codecov/patch

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

Added line #L113 was not covered by tests
}
for (basicBlock in entries) {
if (basicBlock.contains(inst)) {
Expand Down
19 changes: 3 additions & 16 deletions jacodb-core/src/main/kotlin/org/jacodb/impl/cfg/graphs/GraphDominators.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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() }
}
2 changes: 1 addition & 1 deletion jacodb-ets/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
83 changes: 0 additions & 83 deletions jacodb-ets/src/main/kotlin/org/jacodb/ets/base/Position.kt
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions jacodb-ets/src/main/kotlin/org/jacodb/ets/base/StmtPositionInfo.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion jacodb-ets/src/main/kotlin/org/jacodb/ets/dsl/BlockCfg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading