Merge pull request #17474 from github/redsun82/swift-cfg-order-disambuigation

redsun82 · web-flow · commit 37f3ea137b1b · 2024-09-16T16:54:26.000+02:00
Swift: tentative fix to Cfg disambuigation
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.ql b/swift/ql/test/library-tests/controlflow/graph/Cfg.ql
@@ -11,7 +11,7 @@ class MyRelevantNode extends ControlFlowNode {
   private AstNode asAstNode() { result = this.getAstNode().asAstNode() }
 
   string getOrderDisambiguation() {
-    result = this.asAstNode().getPrimaryQlClasses()
+    result = concat([this.asAstNode().getAPrimaryQlClass(), this.asAstNode().toString()], ",")
     or
     not exists(this.asAstNode()) and result = ""
   }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class MyRelevantNode extends ControlFlowNode {`
`11`	`11`	`private AstNode asAstNode() { result = this.getAstNode().asAstNode() }`
`12`	`12`
`13`	`13`	`string getOrderDisambiguation() {`
`14`		`- result = this.asAstNode().getPrimaryQlClasses()`
	`14`	`+ result = concat([this.asAstNode().getAPrimaryQlClass(), this.asAstNode().toString()], ",")`
`15`	`15`	`or`
`16`	`16`	`not exists(this.asAstNode()) and result = ""`
`17`	`17`	`}`