fix computed property call properties

max-leuthaeuser · max-leuthaeuser · commit d681dcf150ed · 2026-01-15T15:32:45.000+01:00
diff --git a/joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/astcreation/AstForDeclSyntaxCreator.scala b/joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/astcreation/AstForDeclSyntaxCreator.scala
@@ -1010,6 +1010,12 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
     scope.pushNewMethodScope(methodFullName, methodName, block, capturingRefNode)
     localAstParentStack.push(block)
 
+    val selfTpe = fullNameOfEnclosingTypeDecl()
+    val selfParameterNode =
+      parameterInNode(node, "self", "self", 0, false, EvaluationStrategies.BY_SHARING, selfTpe)
+    scope.addVariable("self", selfParameterNode, selfTpe, VariableScopeManager.ScopeType.MethodScope)
+    val selfParameterNodeAst = Ast(selfParameterNode)
+
     val parameterAsts = if (parameters.isEmpty && accessorSpecifier == "set") {
       val name          = "newValue" // Swift default parameter name for set accessors
       val parameterNode = parameterInNode(node, name, name, 1, false, EvaluationStrategies.BY_VALUE, Some(tpe))
@@ -1032,34 +1038,13 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
       }
       .getOrElse(List.empty[Ast])
 
-    val syntheticBodyStmtAst = if (bodyStmtAsts.isEmpty) {
-      accessorSpecifier match {
-        case "set" =>
-          val selfNode = identifierNode(node, "self", "self", fullNameOfEnclosingTypeDecl())
-          scope.addVariableReference("self", selfNode, selfNode.typeFullName, EvaluationStrategies.BY_REFERENCE)
-          val fieldAccess   = fieldAccessAst(node, node, Ast(selfNode), s"self.$variableName", variableName, tpe)
-          val sourceName    = parameterAsts.head.root.collect { case p: NewMethodParameterIn => p.name }.get
-          val barIdentifier = identifierNode(node, sourceName, sourceName, tpe)
-          scope.addVariableReference(sourceName, barIdentifier, tpe, EvaluationStrategies.BY_REFERENCE)
-          List(createAssignmentCallAst(node, fieldAccess, Ast(barIdentifier), s"self.$variableName = $sourceName"))
-        case "get" =>
-          val selfNode = identifierNode(node, "self", "self", fullNameOfEnclosingTypeDecl())
-          scope.addVariableReference("self", selfNode, selfNode.typeFullName, EvaluationStrategies.BY_REFERENCE)
-          val fieldAccess = fieldAccessAst(node, node, Ast(selfNode), s"self.$variableName", variableName, tpe)
-          List(returnAst(returnNode(node, variableName), List(fieldAccess)))
-        case _ => List.empty[Ast]
-      }
-    } else {
-      bodyStmtAsts
-    }
-
     val methodReturnNode_ = methodReturnNode(node, returnType)
 
-    val blockAst_ = blockAst(block, syntheticBodyStmtAst)
+    val blockAst_ = blockAst(block, bodyStmtAsts)
     val astForMethod =
       methodAstWithAnnotations(
         methodNode_,
-        parameterAsts,
+        selfParameterNodeAst +: parameterAsts,
         blockAst_,
         methodReturnNode_,
         modifiers = modifiers,
@@ -1245,30 +1230,9 @@ trait AstForDeclSyntaxCreator(implicit withSchemaValidation: ValidationMode) {
       }
       .getOrElse(List.empty[Ast])
 
-    val syntheticBodyStmtAst = if (bodyStmtAsts.isEmpty) {
-      accessorSpecifier match {
-        case "set" =>
-          val selfNode = identifierNode(node, "self", "self", fullNameOfEnclosingTypeDecl())
-          scope.addVariableReference("self", selfNode, selfNode.typeFullName, EvaluationStrategies.BY_REFERENCE)
-          val fieldAccess   = fieldAccessAst(node, node, Ast(selfNode), s"self.$variableName", variableName, tpe)
-          val sourceName    = parameterAsts.head.root.collect { case p: NewMethodParameterIn => p.name }.get
-          val barIdentifier = identifierNode(node, sourceName, sourceName, tpe)
-          scope.addVariableReference(sourceName, barIdentifier, tpe, EvaluationStrategies.BY_REFERENCE)
-          List(createAssignmentCallAst(node, fieldAccess, Ast(barIdentifier), s"self.$variableName = $sourceName"))
-        case "get" =>
-          val selfNode = identifierNode(node, "self", "self", fullNameOfEnclosingTypeDecl())
-          scope.addVariableReference("self", selfNode, selfNode.typeFullName, EvaluationStrategies.BY_REFERENCE)
-          val fieldAccess = fieldAccessAst(node, node, Ast(selfNode), s"self.$variableName", variableName, tpe)
-          List(returnAst(returnNode(node, variableName), List(fieldAccess)))
-        case _ => List.empty[Ast]
-      }
-    } else {
-      bodyStmtAsts
-    }
-
     val methodReturnNode_ = methodReturnNode(node, returnType)
 
-    val blockAst_ = blockAst(block, syntheticBodyStmtAst)
+    val blockAst_ = blockAst(block, bodyStmtAsts)
     val astForMethod =
       methodAstWithAnnotations(
         methodNode_,
diff --git a/joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/passes/ExtensionsPass.scala b/joern-cli/frontends/swiftsrc2cpg/src/main/scala/io/joern/swiftsrc2cpg/passes/ExtensionsPass.scala
@@ -112,23 +112,34 @@ class ExtensionsPass(
     }
   }
 
-  /** Rewrites computed-property-style member accesses to the corresponding getter call when known.
+  /** Rewrites computed property member accesses to the corresponding getter call when resolvable.
     *
-    * For each `fieldAccess`, the base type and member name are used to derive candidate fullNames (e.g., `T.m` and
-    * `T.m.getter`). If a matching entry exists in `memberPropertyMapping`, the access node's `METHOD_FULL_NAME` is
-    * updated to the resolved getter fullName.
+    * For each `fieldAccess` call node:
+    *   - reads the base expression's `TYPE_FULL_NAME` and the member name from the access arguments
+    *   - derives candidate member fullNames (e.g., `T.m` and `T.m.getter`)
+    *   - if a match exists in `memberPropertyMapping`, updates the access to reference the getter by setting:
+    *     - `NAME` and `METHOD_FULL_NAME` to the resolved getter
+    *     - `DISPATCH_TYPE` to `DYNAMIC_DISPATCH`
+    *     - ensures a `RECEIVER` edge from the access to the base expression and fixes argument indices/orders
     */
   private def handleMemberPropertyCalls(diffGraph: DiffGraphBuilder): Unit = {
     val fieldAccesses = cpg.fieldAccess
     fieldAccesses.foreach { fieldAccess =>
-      val memberFullNameMaybe = for {
-        baseFullName <- fieldAccess.arguments(1).headOption.flatMap(typeFullNameOf)
+      for {
+        base         <- fieldAccess.arguments(1).headOption
+        baseFullName <- base.flatMap(typeFullNameOf)
         memberName   <- fieldAccess.arguments(2).headOption.map(_.code)
-      } yield Seq(s"$baseFullName.$memberName.getter", s"$baseFullName.$memberName")
-
-      memberFullNameMaybe.getOrElse(Seq.empty).foreach { memberFullName =>
-        memberPropertyMapping.get(memberFullName).foreach { propertyFullName =>
-          diffGraph.setNodeProperty(fieldAccess, PropertyNames.MethodFullName, propertyFullName)
+      } {
+        Seq(s"$memberName.getter", memberName).foreach { memberName =>
+          val memberFullName = s"$baseFullName.$memberName"
+          memberPropertyMapping.get(memberFullName).foreach { propertyFullName =>
+            diffGraph.setNodeProperty(fieldAccess, PropertyNames.Name, memberName)
+            diffGraph.setNodeProperty(fieldAccess, PropertyNames.MethodFullName, propertyFullName)
+            diffGraph.setNodeProperty(fieldAccess, PropertyNames.DispatchType, DispatchTypes.DYNAMIC_DISPATCH)
+            diffGraph.addEdge(fieldAccess, base, EdgeTypes.RECEIVER)
+            diffGraph.setNodeProperty(base, PropertyNames.ArgumentIndex, 0)
+            diffGraph.setNodeProperty(base, PropertyNames.Order, 1)
+          }
         }
       }
     }
diff --git a/joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/ExtensionWithCompilerTests.scala b/joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/ExtensionWithCompilerTests.scala
@@ -1,6 +1,7 @@
 package io.joern.swiftsrc2cpg.passes.ast
 
 import io.joern.swiftsrc2cpg.testfixtures.SwiftCompilerSrc2CpgSuite
+import io.shiftleft.codepropertygraph.generated.DispatchTypes
 import io.shiftleft.semanticcpg.language.*
 
 class ExtensionWithCompilerTests extends SwiftCompilerSrc2CpgSuite {
@@ -84,6 +85,32 @@ class ExtensionWithCompilerTests extends SwiftCompilerSrc2CpgSuite {
         "SwiftTest.Foo<extension>.y:Swift.Int"
       )
 
+      val List(aGetter) = cpg.call.nameExact("a.getter").codeExact("foo.a").l
+      aGetter.dispatchType shouldBe DispatchTypes.DYNAMIC_DISPATCH
+      aGetter.methodFullName shouldBe "SwiftTest.Foo.a.getter:Swift.Int"
+      aGetter.receiver.argumentIndex.loneElement shouldBe 0
+      aGetter.receiver.code.loneElement shouldBe "foo"
+
+      val List(bGetter) = cpg.call.nameExact("b.getter").codeExact("foo.b").l
+      bGetter.dispatchType shouldBe DispatchTypes.DYNAMIC_DISPATCH
+      bGetter.methodFullName shouldBe "SwiftTest.Foo<extension>.b.getter:Swift.Int"
+      bGetter.receiver.argumentIndex.loneElement shouldBe 0
+      bGetter.receiver.code.loneElement shouldBe "foo"
+
+      val List(xGetter) = cpg.call.nameExact("x").l
+      xGetter.dispatchType shouldBe DispatchTypes.DYNAMIC_DISPATCH
+      xGetter.code shouldBe "foo.x"
+      xGetter.methodFullName shouldBe "SwiftTest.Foo.x:Swift.Int"
+      xGetter.receiver.argumentIndex.loneElement shouldBe 0
+      xGetter.receiver.code.loneElement shouldBe "foo"
+
+      val List(yGetter) = cpg.call.nameExact("y").l
+      yGetter.dispatchType shouldBe DispatchTypes.DYNAMIC_DISPATCH
+      yGetter.code shouldBe "foo.y"
+      yGetter.methodFullName shouldBe "SwiftTest.Foo<extension>.y:Swift.Int"
+      yGetter.receiver.argumentIndex.loneElement shouldBe 0
+      yGetter.receiver.code.loneElement shouldBe "foo"
+
       cpg.typeDecl.nameExact("Foo").member.name.sorted shouldBe Seq("a", "b", "x", "y")
     }
 
diff --git a/joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/SimpleAstCreationPassTest.scala b/joern-cli/frontends/swiftsrc2cpg/src/test/scala/io/joern/swiftsrc2cpg/passes/ast/SimpleAstCreationPassTest.scala
@@ -479,22 +479,14 @@ class SimpleAstCreationPassTest extends AstSwiftSrc2CpgSuite {
 
       val List(get, set, willSet, didSet) = cpg.typeDecl.nameExact("Foo").boundMethod.nameNot("init").l
       get.fullName shouldBe "Test0.swift:<global>.Foo.bar.getter:Swift.Int"
-      val List(getReturn) = get.body.astChildren.isReturn.l
-      getReturn.code shouldBe "bar"
-      val List(thisBar) = getReturn.astChildren.isCall.l
-      thisBar.name shouldBe Operators.fieldAccess
-      thisBar.typeFullName shouldBe "Swift.Int"
-      inside(thisBar.argument.l) { case List(base: Identifier, field: FieldIdentifier) =>
-        base.name shouldBe "self"
-        base.typeFullName shouldBe "Test0.swift:<global>.Foo"
-        field.canonicalName shouldBe "bar"
-      }
 
       set.fullName shouldBe "Test0.swift:<global>.Foo.bar.setter:Swift.Int"
-      val List(setParam) = set.parameter.l
+      val List(self, setParam) = set.parameter.l
+      self.name shouldBe "self"
+      self.typeFullName shouldBe "Test0.swift:<global>.Foo"
+
       setParam.name shouldBe "newValue"
       setParam.typeFullName shouldBe "Swift.Int"
-      set.body.astChildren.isCall.code.l shouldBe List("self.bar = newValue")
 
       willSet.fullName shouldBe "Test0.swift:<global>.Foo.bar.willSet:Swift.Int"
       didSet.fullName shouldBe "Test0.swift:<global>.Foo.bar.didSet:Swift.Int"
