Merge pull request #9284 from MathiasVP/more-cfg-for-exprs

Swift: CFG for `TypeExpr`, `MemberRefExpr`, `DefaultArgumentExpr` and `ForceValueExpr`

Author: Robert Marsh

swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll

@@ -908,6 +908,8 @@ module Exprs {
     }
   }
 
+  private class TypeTree extends LeafTree instanceof TypeExpr { }
+
   private class DynamicTypeTree extends StandardPostOrderTree instanceof DynamicTypeExpr {
     final override ControlFlowTree getChildElement(int i) {
       result = super.getBaseExpr().getFullyConverted() and i = 0
@@ -951,7 +953,13 @@ module Exprs {
     }
   }
 
-  private class DeclRefExprTree extends LeafTree, DeclRefExpr { }
+  private class DeclRefExprTree extends LeafTree instanceof DeclRefExpr { }
+
+  private class MemberRefTree extends StandardPostOrderTree instanceof MemberRefExpr {
+    final override AstNode getChildElement(int i) {
+      result = super.getBaseExpr().getFullyConverted() and i = 0
+    }
+  }
 
   private class ApplyExprTree extends StandardPostOrderTree instanceof ApplyExpr {
     ApplyExprTree() {
@@ -969,6 +977,15 @@ module Exprs {
     }
   }
 
+  private class DefaultArgumentTree extends LeafTree instanceof DefaultArgumentExpr { }
+
+  private class ForceValueTree extends StandardPostOrderTree instanceof ForceValueExpr {
+    override AstNode getChildElement(int i) {
+      i = 0 and
+      result = super.getSubExpr().getFullyConverted()
+    }
+  }
+
   private class LogicalAndTree extends PostOrderTree, LogicalAndExpr {
     final override predicate propagatesAbnormal(AstNode child) {
       child = this.getAnOperand().getFullyConverted()