Skip to content

Commit 3fd579d

Browse files
authored
update cpg, adapt to change of ambiguous callIn/Out name (#5614)
1 parent b75175d commit 3fd579d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name := "joern"
22
ThisBuild / organization := "io.joern"
33
ThisBuild / scalaVersion := "3.6.4"
44

5-
val cpgVersion = "1.7.43"
5+
val cpgVersion = "1.7.46"
66

77
lazy val joerncli = Projects.joerncli
88
lazy val querydb = Projects.querydb

joern-cli/frontends/c2cpg/src/test/scala/io/joern/c2cpg/passes/FullNameUniquenessPassTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ class FullNameUniquenessPassTests extends C2CpgSuite {
123123
)
124124
cpg.call
125125
.map(c =>
126-
s"${c.name} in ${c.file.map(_.name).head} -> CALL -> ${c.methodFullName} in ${c.callOut.filename.head}"
126+
s"${c.name} in ${c.file.map(_.name).head} -> CALL -> ${c.methodFullName} in ${c.staticCallOut.filename.head}"
127127
)
128128
.sorted
129129
.l shouldBe List(

joern-cli/frontends/jimple2cpg/src/test/scala/io/joern/jimple2cpg/querying/ConstructorInvocationTests.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class ConstructorInvocationTests extends JimpleCode2CpgFixture {
112112

113113
init.name shouldBe io.joern.x2cpg.Defines.ConstructorMethodName
114114
init.methodFullName shouldBe "Bar.<init>:void(int,int)"
115-
init.callOut.head.fullName shouldBe "Bar.<init>:void(int,int)"
115+
init.staticCallOut.head.fullName shouldBe "Bar.<init>:void(int,int)"
116116
init.dispatchType shouldBe DispatchTypes.STATIC_DISPATCH.toString
117117
init.typeFullName shouldBe "void"
118118
init.signature shouldBe "void(int,int)"
@@ -149,7 +149,7 @@ class ConstructorInvocationTests extends JimpleCode2CpgFixture {
149149

150150
init.name shouldBe io.joern.x2cpg.Defines.ConstructorMethodName
151151
init.methodFullName shouldBe "Bar.<init>:void(int,int)"
152-
init.callOut.head.fullName shouldBe "Bar.<init>:void(int,int)"
152+
init.staticCallOut.head.fullName shouldBe "Bar.<init>:void(int,int)"
153153
init.dispatchType shouldBe DispatchTypes.STATIC_DISPATCH.toString
154154
init.typeFullName shouldBe "void"
155155
init.signature shouldBe "void(int,int)"
@@ -190,7 +190,7 @@ class ConstructorInvocationTests extends JimpleCode2CpgFixture {
190190

191191
init.name shouldBe io.joern.x2cpg.Defines.ConstructorMethodName
192192
init.methodFullName shouldBe "Bar.<init>:void(int)"
193-
init.callOut.head.fullName shouldBe "Bar.<init>:void(int)"
193+
init.staticCallOut.head.fullName shouldBe "Bar.<init>:void(int)"
194194
init.signature shouldBe "void(int)"
195195
init.code shouldBe "$stack1.Bar(42)"
196196
init.dispatchType shouldBe DispatchTypes.STATIC_DISPATCH.toString

semanticcpg/src/main/scala/io/shiftleft/semanticcpg/dotgenerator/CallGraphGenerator.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class CallGraphGenerator {
1616
srcMethod <- vertices
1717
_ = storeInSubgraph(srcMethod, subgraph)
1818
child <- srcMethod.call
19-
tgt <- child.callOut
19+
tgt <- child.staticCallOut
2020
} yield {
2121
storeInSubgraph(tgt, subgraph)
2222
Edge(srcMethod, tgt, label = child.dispatchType.stripSuffix("_DISPATCH"))

0 commit comments

Comments
 (0)