Merge pull request #4395 from geoffw0/modelbeginend

C++: Merge StdSequenceContainerBeginEnd into the general BeginOrEndFunction

Author: Robert Marsh

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

@@ -280,7 +280,9 @@ class IteratorArrayMemberOperator extends MemberFunction, TaintFunction, Iterato
  */
 class BeginOrEndFunction extends MemberFunction, TaintFunction {
   BeginOrEndFunction() {
-    this.hasName(["begin", "cbegin", "rbegin", "crbegin", "end", "cend", "rend", "crend"]) and
+    this
+        .hasName(["begin", "cbegin", "rbegin", "crbegin", "end", "cend", "rend", "crend",
+              "before_begin", "cbefore_begin"]) and
     this.getType().getUnspecifiedType() instanceof Iterator
   }
 

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

@@ -170,26 +170,6 @@ class StdSequenceContainerAssign extends TaintFunction {
   }
 }
 
-/**
- * The standard container `begin` and `end` functions and their
- * variants.
- */
-class StdSequenceContainerBeginEnd extends TaintFunction {
-  StdSequenceContainerBeginEnd() {
-    this
-        .hasQualifiedName("std", ["array", "vector", "deque", "list"],
-          ["begin", "cbegin", "rbegin", "crbegin", "end", "cend", "rend", "crend"]) or
-    this
-        .hasQualifiedName("std", "forward_list",
-          ["before_begin", "begin", "end", "cbefore_begin", "cbegin", "cend"])
-  }
-
-  override predicate hasTaintFlow(FunctionInput input, FunctionOutput output) {
-    input.isQualifierObject() and
-    output.isReturnValue()
-  }
-}
-
 /**
  * The standard container `swap` functions.
  */