[javasrc2cpg] support flows for field accesses with a TYPE_REF base n…

…ode (#5076) * [javasrc2cpg] support flows for field accesses with a TYPE_REF base node * scalafmt * simplify `.where(_.or...)` with `.or(...)` cf. review suggestion Co-authored-by: maltek <1694194+maltek@users.noreply.github.com> --------- Co-authored-by: maltek <1694194+maltek@users.noreply.github.com>
joernio · Nov 7, 2024 · 6465bfe · 6465bfe
1 parent 6470dd7
commit 6465bfe
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...neoss/src/main/scala/io/joern/dataflowengineoss/queryengine/SourcesToStartingPoints.scala b/...neoss/src/main/scala/io/joern/dataflowengineoss/queryengine/SourcesToStartingPoints.scala
@@ -147,7 +147,10 @@ class SourceToStartingPointsInMethod(
   private def usageInOtherClasses(m: Method, usageInputs: List[UsageInput]): List[StartingPointWithSource] = {
     usageInputs.flatMap { case UsageInput(src, typeDecl, astNode) =>
       m.fieldAccess
-        .where(_.argument(1).isIdentifier.typeFullNameExact(typeDecl.fullName))
+        .or(
+          _.argument(1).isIdentifier.typeFullNameExact(typeDecl.fullName),
+          _.argument(1).isTypeRef.typeFullNameExact(typeDecl.fullName)
+        )
         .where { x =>
           astNode match {
             case identifier: Identifier =>

diff --git a/...tends/javasrc2cpg/src/test/scala/io/joern/javasrc2cpg/querying/dataflow/ObjectTests.scala b/...tends/javasrc2cpg/src/test/scala/io/joern/javasrc2cpg/querying/dataflow/ObjectTests.scala
@@ -6,8 +6,7 @@ import io.shiftleft.semanticcpg.language.*
 
 class NewObjectTests extends JavaSrcCode2CpgFixture(withOssDataflow = true) {
 
-  // FIXME: stopped working after https://github.com/joernio/joern/pull/5036
-  "static field passed as an argument inside a same-class static method whilst being referenced by its simple name" ignore {
+  "static field passed as an argument inside a same-class static method whilst being referenced by its simple name" in {
     val cpg = code("""
         |class Bar {
         | static String CONST = "<const>";
@@ -18,7 +17,7 @@ class NewObjectTests extends JavaSrcCode2CpgFixture(withOssDataflow = true) {
     val sink   = cpg.call("println").argument(1)
     val source = cpg.literal
     sink.reachableByFlows(source).map(flowToResultPairs).l shouldBe List(
-      List(("String Bar.CONST = \"<const>\"", Some(3)), ("System.out.println(Bar.CONST)", Some(5)))
+      List(("String Bar.CONST = \"<const>\"", Some(3)), ("System.out.println(CONST)", Some(5)))
     )
   }