C++: Move all of the swap models into Swap.qll.

cpp/ql/src/semmle/code/cpp/models/implementations/StdContainer.qll

@@ -170,24 +170,6 @@ private class StdSequenceContainerAssign extends TaintFunction {
   }
 }
 
-/**
- * The standard container `swap` functions.
- */
-private class StdSequenceContainerSwap extends TaintFunction {
-  StdSequenceContainerSwap() {
-    this.hasQualifiedName("std", ["array", "vector", "deque", "list", "forward_list"], "swap")
-  }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    // container1.swap(container2)
-    input.isQualifierObject() and
-    output.isParameterDeref(0)
-    or
-    input.isParameterDeref(0) and
-    output.isQualifierObject()
-  }
-}
-
 /**
  * The standard container functions `at` and `operator[]`.
  */

cpp/ql/src/semmle/code/cpp/models/implementations/StdMap.qll

@@ -102,22 +102,6 @@ private class StdMapTryEmplace extends TaintFunction {
   }
 }
 
-/**
- * The standard map `swap` function.
- */
-private class StdMapSwap extends TaintFunction {
-  StdMapSwap() { this.hasQualifiedName("std", ["map", "unordered_map"], "swap") }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    // container1.swap(container2)
-    input.isQualifierObject() and
-    output.isParameterDeref(0)
-    or
-    input.isParameterDeref(0) and
-    output.isQualifierObject()
-  }
-}
-
 /**
  * The standard map `merge` function.
  */

cpp/ql/src/semmle/code/cpp/models/implementations/StdPair.qll

@@ -60,19 +60,3 @@ private class StdPairConstructor extends Constructor, TaintFunction {
     )
   }
 }
-
-/**
- * The standard pair `swap` function.
- */
-private class StdPairSwap extends TaintFunction {
-  StdPairSwap() { this.hasQualifiedName("std", "pair", "swap") }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    // container1.swap(container2)
-    input.isQualifierObject() and
-    output.isParameterDeref(0)
-    or
-    input.isParameterDeref(0) and
-    output.isQualifierObject()
-  }
-}

cpp/ql/src/semmle/code/cpp/models/implementations/StdSet.qll

@@ -72,22 +72,6 @@ private class StdSetEmplace extends TaintFunction {
   }
 }
 
-/**
- * The standard set `swap` functions.
- */
-private class StdSetSwap extends TaintFunction {
-  StdSetSwap() { this.hasQualifiedName("std", ["set", "unordered_set"], "swap") }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    // container1.swap(container2)
-    input.isQualifierObject() and
-    output.isParameterDeref(0)
-    or
-    input.isParameterDeref(0) and
-    output.isQualifierObject()
-  }
-}
-
 /**
  * The standard set `merge` function.
  */

cpp/ql/src/semmle/code/cpp/models/implementations/StdString.qll

@@ -252,25 +252,6 @@ private class StdStringSubstr extends TaintFunction {
   }
 }
 
-/**
- * The standard functions `std::string.swap` and `std::stringstream::swap`.
- */
-private class StdStringSwap extends TaintFunction {
-  StdStringSwap() {
-    this.hasQualifiedName("std", "basic_string", "swap") or
-    this.hasQualifiedName("std", "basic_stringstream", "swap")
-  }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    // str1.swap(str2)
-    input.isQualifierObject() and
-    output.isParameterDeref(0)
-    or
-    input.isParameterDeref(0) and
-    output.isQualifierObject()
-  }
-}
-
 /**
  * The `std::string` functions `at` and `operator[]`.
  */

cpp/ql/src/semmle/code/cpp/models/implementations/Swap.qll

@@ -15,3 +15,88 @@ private class Swap extends DataFlowFunction {
     output.isParameterDeref(0)
   }
 }
+
+/**
+ * The standard functions `std::string.swap` and `std::stringstream::swap`.
+ */
+private class StdStringSwap extends TaintFunction {
+  StdStringSwap() {
+    this.hasQualifiedName("std", "basic_string", "swap") or
+    this.hasQualifiedName("std", "basic_stringstream", "swap")
+  }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    // str1.swap(str2)
+    input.isQualifierObject() and
+    output.isParameterDeref(0)
+    or
+    input.isParameterDeref(0) and
+    output.isQualifierObject()
+  }
+}
+
+/**
+ * The standard container `swap` functions.
+ */
+private class StdSequenceContainerSwap extends TaintFunction {
+  StdSequenceContainerSwap() {
+    this.hasQualifiedName("std", ["array", "vector", "deque", "list", "forward_list"], "swap")
+  }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    // container1.swap(container2)
+    input.isQualifierObject() and
+    output.isParameterDeref(0)
+    or
+    input.isParameterDeref(0) and
+    output.isQualifierObject()
+  }
+}
+
+/**
+ * The standard set `swap` functions.
+ */
+private class StdSetSwap extends TaintFunction {
+  StdSetSwap() { this.hasQualifiedName("std", ["set", "unordered_set"], "swap") }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    // container1.swap(container2)
+    input.isQualifierObject() and
+    output.isParameterDeref(0)
+    or
+    input.isParameterDeref(0) and
+    output.isQualifierObject()
+  }
+}
+
+/**
+ * The standard pair `swap` function.
+ */
+private class StdPairSwap extends TaintFunction {
+  StdPairSwap() { this.hasQualifiedName("std", "pair", "swap") }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    // container1.swap(container2)
+    input.isQualifierObject() and
+    output.isParameterDeref(0)
+    or
+    input.isParameterDeref(0) and
+    output.isQualifierObject()
+  }
+}
+
+/**
+ * The standard map `swap` function.
+ */
+private class StdMapSwap extends TaintFunction {
+  StdMapSwap() { this.hasQualifiedName("std", ["map", "unordered_map"], "swap") }
+
+  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
+    // container1.swap(container2)
+    input.isQualifierObject() and
+    output.isParameterDeref(0)
+    or
+    input.isParameterDeref(0) and
+    output.isQualifierObject()
+  }
+}