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
2020
2121interface CommonInst {
2222 val location: CommonInstLocation
23-
24- val method: CommonMethod
25- get() = location.method
2623}
2724
2825interface CommonInstLocation {
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -55,8 +55,6 @@ interface JcInst : CommonInst {
5555 override val location: JcInstLocation
5656 val operands: List <JcExpr >
5757
58- override val method: JcMethod
59- get() = location.method
6058 val lineNumber: Int
6159 get() = location.lineNumber
6260
Original file line number Diff line number Diff line change @@ -109,8 +109,8 @@ class JcBlockGraphImpl(
109109 (block.start.index.. block.end.index).map { jcGraph.instructions[it] }
110110
111111 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} "
114114 }
115115 for (basicBlock in entries) {
116116 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
2525interface EtsStmt : CommonInst {
2626 override val location: EtsStmtLocation
2727
28- override val method: EtsMethod
29- get() = location.method
30-
3128 interface Visitor <out R > {
3229 fun visit (stmt : EtsNopStmt ): R
3330 fun visit (stmt : EtsAssignStmt ): R
Original file line number Diff line number Diff line change @@ -154,7 +154,7 @@ fun InterproceduralCfg.toHighlightedDotWithCalls(
154154 val h = sanitize(stmt.hashCode())
155155 val clusterName = " cluster_${h} _B${parentBlock} "
156156 // method signature label
157- val methodSig = cfg.entries.first().method.signature
157+ val methodSig = cfg.entries.first().location. method.signature
158158 // open subgraph
159159 lines + = " subgraph \" $clusterName \" {"
160160 lines + = " label=\" $methodSig \" ;"
You can’t perform that action at this time.
0 commit comments