Skip to content

Populate static receiver field for javasrc2cpg #5610

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Populate static receiver field for javasrc2cpg #5610

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9ab450
Populate static receiver field for javasrc2cpg
johannescoetzee Jul 25, 2025
ceec5cc
Fix formatting
johannescoetzee Jul 28, 2025
3a46712
Add tests for static calls on an instance
johannescoetzee Jul 29, 2025
1092fe7
Merge branch 'master' into johannes/javasrc-static-receiver
johannescoetzee Aug 4, 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
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name := "joern"
ThisBuild / organization := "io.joern"
ThisBuild / scalaVersion := "3.6.4"

val cpgVersion = "1.7.43"
val cpgVersion = "1.7.45"

lazy val joerncli = Projects.joerncli
lazy val querydb = Projects.querydb
Expand Down
4 changes: 3 additions & 1 deletion ...ain/scala/io/joern/javasrc2cpg/astcreation/expressions/AstForCallExpressionsCreator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ trait AstForCallExpressionsCreator { this: AstCreator =>
.toList
}

val receiverType = scopeAsts.rootType.filter(_ != TypeConstants.Any).orElse(receiverTypeOption)
val receiverType = scopeAsts.rootType.filter(_ != TypeConstants.Any).orElse(receiverTypeOption)
val staticReceiver = Option.when(dispatchType == DispatchTypes.STATIC_DISPATCH)(receiverType).flatten

val argumentsCode = getArgumentCodeString(call.getArguments)
val codePrefix = scopeAsts.headOption
Expand All @@ -103,6 +104,7 @@ trait AstForCallExpressionsCreator { this: AstCreator =>
.lineNumber(line(call))
.columnNumber(column(call))
.typeFullName(expressionTypeFullName.getOrElse(defaultTypeFallback()))
.staticReceiver(staticReceiver)

callAst(callRoot, argumentAsts, scopeAsts.headOption)
}
Expand Down
132 changes: 130 additions & 2 deletions joern-cli/frontends/javasrc2cpg/src/test/scala/io/joern/javasrc2cpg/querying/CallTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ class NewCallTests extends JavaSrcCode2CpgFixture {
|
|""".stripMargin)

cpg.call.name("valueOf").methodFullName.l shouldBe List("java.lang.String.valueOf:java.lang.String(boolean)")
inside(cpg.call.name("valueOf").l) { case List(valueOfCall) =>
valueOfCall.methodFullName shouldBe "java.lang.String.valueOf:java.lang.String(boolean)"
valueOfCall.staticReceiver shouldBe Some("java.lang.String")
}
}

"they are instance methods imported from java.lang.* should be resolved" in {
Expand Down Expand Up @@ -131,7 +134,132 @@ class NewCallTests extends JavaSrcCode2CpgFixture {
|}
|""".stripMargin)

cpg.call.name("foo").methodFullName.l shouldBe List("foo.Foo.foo:java.lang.String()")
inside(cpg.call.name("foo").l) { case List(fooCall) =>
fooCall.methodFullName shouldBe "foo.Foo.foo:java.lang.String()"
fooCall.staticReceiver shouldBe Some("foo.Foo")
}
}

"calls to inherited static methods" should {
Copy link
Contributor

@ml86 ml86 Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add a test where the static method is called on an instance and not directly via the class name.

Copy link
Contributor Author

@johannescoetzee johannescoetzee Jul 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will do! I didn't know that was a thing in Java as well.

val cpg = code("""
|package foo;
|
|class Foo {
| public static String foo() {
| return "FOO";
| }
|}
|""".stripMargin)
.moreCode("""
|package bar;
|
|import foo.Foo;
|
|class Bar extends Foo { }
|""".stripMargin)
.moreCode("""
|package baz;
|
|import bar.Bar;
|
|class Baz {
| void test() {
| Bar.foo();
| }
|}
|""".stripMargin)

"have the correct staticReceiver set" in {
inside(cpg.call.name("foo").l) { case List(fooCall) =>
fooCall.methodFullName shouldBe "bar.Bar.foo:java.lang.String()"
fooCall.staticReceiver shouldBe Some("bar.Bar")
}
}
}

"calls to inherited static methods via an instance" should {
val cpg = code("""
|package foo;
|
|class Foo {
| public static String foo() {
| return "FOO";
| }
|}
|""".stripMargin)
.moreCode("""
|package bar;
|
|import foo.Foo;
|
|class Bar extends Foo {
| public static String foo() {
| return "BAR";
| }
|}
|""".stripMargin)
.moreCode("""
|package baz;
|
|import bar.Bar;
|
|class Baz {
| void test(Bar b) {
| b.foo();
| }
|}
|""".stripMargin)

"have the correct staticReceiver set" in {
inside(cpg.call.name("foo").l) { case List(fooCall) =>
fooCall.dispatchType shouldBe DispatchTypes.STATIC_DISPATCH
fooCall.methodFullName shouldBe "bar.Bar.foo:java.lang.String()"
fooCall.staticReceiver shouldBe Some("bar.Bar")
}
}
}

"calls to overridden static methods via an instance" should {
val cpg = code("""
|package foo;
|
|class Foo {
| public static String foo() {
| return "FOO";
| }
|}
|""".stripMargin)
.moreCode("""
|package bar;
|
|import foo.Foo;
|
|class Bar extends Foo {
| public static String foo() {
| return "BAR";
| }
|}
|""".stripMargin)
.moreCode("""
|package baz;
|
|import bar.Bar;
|import foo.Foo;
|
|class Baz {
| void test(Foo f) {
| f.foo();
| }
|}
|""".stripMargin)

"have the correct staticReceiver set" in {
inside(cpg.call.name("foo").l) { case List(fooCall) =>
fooCall.dispatchType shouldBe DispatchTypes.STATIC_DISPATCH
fooCall.methodFullName shouldBe "foo.Foo.foo:java.lang.String()"
fooCall.staticReceiver shouldBe Some("foo.Foo")
}
}
}

"calls with unresolved receivers should have the correct fullnames" in {
Expand Down
Loading