Merge pull request #9549 from github/alexdenisov/remove-to-string-from-unknown-element

MathiasVP · web-flow · commit ff55efff9920 · 2022-06-14T13:15:18.000+01:00
Swift: remove toString from UnknownElement
diff --git a/swift/ql/lib/codeql/swift/elements/Element.qll b/swift/ql/lib/codeql/swift/elements/Element.qll
@@ -17,6 +17,4 @@ class Element extends ElementBase {
 
 class UnknownElement extends Element {
   UnknownElement() { isUnknown() }
-
-  override string toString() { result = "TBD (" + getPrimaryQlClasses() + ")" }
 }
diff --git a/swift/ql/test/extractor-tests/expressions/all.expected b/swift/ql/test/extractor-tests/expressions/all.expected
@@ -32,7 +32,6 @@
 | expressions.swift:15:14:15:14 | 0 |
 | expressions.swift:16:11:16:11 | AnError.Type |
 | expressions.swift:16:11:16:19 | (Error) ... |
-| expressions.swift:16:11:16:19 | (TBD (ExistentialType)) ... |
 | expressions.swift:16:11:16:19 | call to ... |
 | expressions.swift:16:19:16:19 | failed |
 | expressions.swift:20:1:20:16 | try! ... |
@@ -77,7 +76,6 @@
 | expressions.swift:35:6:35:6 | default terminator |
 | expressions.swift:35:7:35:7 | d |
 | expressions.swift:35:7:35:12 | (Any) ... |
-| expressions.swift:35:7:35:12 | (TBD (ProtocolCompositionType)) ... |
 | expressions.swift:35:7:35:12 | ...[...] |
 | expressions.swift:35:7:35:12 | [...] |
 | expressions.swift:35:7:35:12 | [...] |
@@ -125,7 +123,7 @@
 | expressions.swift:54:1:54:1 | _ |
 | expressions.swift:54:1:54:8 |  ... = ... |
 | expressions.swift:54:5:54:8 | #keyPath(...) |
-| expressions.swift:54:6:54:8 | TBD (UnresolvedDotExpr) |
+| expressions.swift:54:6:54:8 | UnresolvedDotExpr |
 | expressions.swift:58:16:58:16 | 1234 |
 | expressions.swift:59:1:59:1 | unsafeFunction |
 | expressions.swift:59:1:59:34 | call to unsafeFunction |
@@ -243,4 +241,4 @@
 | expressions.swift:154:22:154:56 | \\...[...] |
 | expressions.swift:154:33:154:33 | keyPathB |
 | expressions.swift:154:52:154:55 | #keyPath(...) |
-| expressions.swift:154:53:154:55 | TBD (UnresolvedDotExpr) |
+| expressions.swift:154:53:154:55 | UnresolvedDotExpr |
diff --git a/swift/ql/test/extractor-tests/patterns/all.expected b/swift/ql/test/extractor-tests/patterns/all.expected
@@ -13,7 +13,7 @@
 | patterns.swift:12:14:12:21 | (...) |
 | patterns.swift:12:15:12:15 | xx |
 | patterns.swift:12:19:12:19 | yy |
-| patterns.swift:16:10:16:14 | TBD (SequenceExpr) |
+| patterns.swift:16:10:16:14 | SequenceExpr |
 | patterns.swift:17:10:17:10 | _ |
 | patterns.swift:24:9:24:9 | v |
 | patterns.swift:24:9:24:12 | ... as ... |
diff --git a/swift/ql/test/extractor-tests/types/Types.expected b/swift/ql/test/extractor-tests/types/Types.expected
@@ -5,14 +5,9 @@
 | types.swift:3:6:3:6 | default terminator | String |
 | types.swift:3:7:3:7 | x | Int |
 | types.swift:3:7:3:11 | (Any) ... | Any |
-| types.swift:3:7:3:11 | (Any) ... | TBD (ProtocolCompositionType) |
-| types.swift:3:7:3:11 | (TBD (ProtocolCompositionType)) ... | Any |
-| types.swift:3:7:3:11 | (TBD (ProtocolCompositionType)) ... | TBD (ProtocolCompositionType) |
 | types.swift:3:7:3:11 | ... call to + ... | Int |
 | types.swift:3:7:3:11 | [...] | Any... |
 | types.swift:3:7:3:11 | [...] | Any... |
-| types.swift:3:7:3:11 | [...] | TBD (VariadicSequenceType) |
-| types.swift:3:7:3:11 | [...] | TBD (VariadicSequenceType) |
 | types.swift:3:9:3:9 | + | (Int.Type) -> (Int, Int) -> Int |
 | types.swift:3:9:3:9 | Int.Type | Int.Type |
 | types.swift:3:9:3:9 | call to + | (Int, Int) -> Int |
diff --git a/swift/ql/test/library-tests/controlflow/graph/Cfg.expected b/swift/ql/test/library-tests/controlflow/graph/Cfg.expected
diff --git a/swift/ql/test/library-tests/parent/parent.expected b/swift/ql/test/library-tests/parent/parent.expected

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,4 @@ class Element extends ElementBase {`
`17`	`17`
`18`	`18`	`class UnknownElement extends Element {`
`19`	`19`	`UnknownElement() { isUnknown() }`
`20`		`-`
`21`		`- override string toString() { result = "TBD (" + getPrimaryQlClasses() + ")" }`
`22`	`20`	`}`