Merge pull request #13816 from geoffw0/contig2

Swift: Use enum content in withContiguousStorageIfAvailable model.

Author: geoffw0

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Sequence.qll

@@ -26,7 +26,7 @@ private class SequenceSummaries extends SummaryModelCsv {
         ";Sequence;true;joined(separator:);;;Argument[-1..0];ReturnValue;taint",
         ";Sequence;true;first(where:);;;Argument[-1];ReturnValue;taint",
         ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[-1];Argument[0].Parameter[0];taint",
-        ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[0].ReturnValue;ReturnValue;taint",
+        ";Sequence;true;withContiguousStorageIfAvailable(_:);;;Argument[0].ReturnValue;ReturnValue.OptionalSome;value",
       ]
   }
 }

swift/ql/test/library-tests/dataflow/taint/libraries/string.swift

@@ -639,7 +639,7 @@ func furtherTaintThroughCallbacks() {
     ptr in
     return source()
   }) {
-    sink(arg: result4) // $ MISSING: tainted=640
+    sink(arg: result4) // $ tainted=640
   }
 
   // using a non-closure function