File tree Expand file tree Collapse file tree 6 files changed +3
-49
lines changed
jacodb-api-common/src/main/kotlin/org/jacodb/api/common/cfg
jacodb-api-jvm/src/main/kotlin/org/jacodb/api/jvm/cfg
jacodb-core/src/main/kotlin/org/jacodb/impl/cfg
jacodb-ets/src/main/kotlin/org/jacodb/ets Expand file tree Collapse file tree 6 files changed +3
-49
lines changed Original file line number Diff line number Diff line change @@ -20,9 +20,6 @@ import org.jacodb.api.common.CommonMethod
20
20
21
21
interface CommonInst {
22
22
val location: CommonInstLocation
23
-
24
- val method: CommonMethod
25
- get() = location.method
26
23
}
27
24
28
25
interface CommonInstLocation {
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -55,8 +55,6 @@ interface JcInst : CommonInst {
55
55
override val location: JcInstLocation
56
56
val operands: List <JcExpr >
57
57
58
- override val method: JcMethod
59
- get() = location.method
60
58
val lineNumber: Int
61
59
get() = location.lineNumber
62
60
Original file line number Diff line number Diff line change @@ -109,8 +109,8 @@ class JcBlockGraphImpl(
109
109
(block.start.index.. block.end.index).map { jcGraph.instructions[it] }
110
110
111
111
override fun block (inst : JcInst ): JcBasicBlock {
112
- assert (inst.method == jcGraph.method) {
113
- " required method of instruction ${jcGraph.method} but got ${inst.method} "
112
+ assert (inst.location. method == jcGraph.method) {
113
+ " required method of instruction ${jcGraph.method} but got ${inst.location. method} "
114
114
}
115
115
for (basicBlock in entries) {
116
116
if (basicBlock.contains(inst)) {
Original file line number Diff line number Diff line change @@ -25,9 +25,6 @@ import org.jacodb.api.common.cfg.CommonReturnInst
25
25
interface EtsStmt : CommonInst {
26
26
override val location: EtsStmtLocation
27
27
28
- override val method: EtsMethod
29
- get() = location.method
30
-
31
28
interface Visitor <out R > {
32
29
fun visit (stmt : EtsNopStmt ): R
33
30
fun visit (stmt : EtsAssignStmt ): R
Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ fun InterproceduralCfg.toHighlightedDotWithCalls(
154
154
val h = sanitize(stmt.hashCode())
155
155
val clusterName = " cluster_${h} _B${parentBlock} "
156
156
// method signature label
157
- val methodSig = cfg.entries.first().method.signature
157
+ val methodSig = cfg.entries.first().location. method.signature
158
158
// open subgraph
159
159
lines + = " subgraph \" $clusterName \" {"
160
160
lines + = " label=\" $methodSig \" ;"
You can’t perform that action at this time.
0 commit comments