Swift: Fix for OptionSet.

geoffw0 · geoffw0 · commit 1fc112e7a7d6 · 2024-11-28T18:48:23.000Z
diff --git a/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/RawRepresentable.qll b/swift/ql/lib/codeql/swift/frameworks/StandardLibrary/RawRepresentable.qll
@@ -12,7 +12,10 @@ private import codeql.swift.dataflow.FlowSteps
  */
 private class RawRepresentableSummaries extends SummaryModelCsv {
   override predicate row(string row) {
-    row = ";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint"
+    row = [
+      ";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint",
+      ";OptionSet;true;init(rawValue:);;;Argument[0];ReturnValue;taint"
+    ]
   }
 }
 
diff --git a/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected b/swift/ql/test/library-tests/dataflow/taint/libraries/TaintInline.expected
@@ -1,4 +1,2 @@
 testFailures
-| optionset.swift:60:49:61:1 | // $ tainted=60\n | Missing result: tainted=60 |
-| optionset.swift:65:58:66:1 | // $ tainted=65\n | Missing result: tainted=65 |
 failures

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,10 @@ private import codeql.swift.dataflow.FlowSteps`
`12`	`12`	`*/`
`13`	`13`	`private class RawRepresentableSummaries extends SummaryModelCsv {`
`14`	`14`	`override predicate row(string row) {`
`15`		`- row = ";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint"`
	`15`	`+ row = [`
	`16`	`+ ";RawRepresentable;true;init(rawValue:);;;Argument[0];ReturnValue;taint",`
	`17`	`+ ";OptionSet;true;init(rawValue:);;;Argument[0];ReturnValue;taint"`
	`18`	`+ ]`
`16`	`19`	`}`
`17`	`20`	`}`
`18`	`21`