Merge pull request #14261 from github/alexdenisov/upgrade-to-swift-5.9

Swift: upgrade to 5.9

swift/downgrades/fcc7b497930add320fabeed9b228b264bc847ae6/unspecified_elements.ql

@@ -0,0 +1,13 @@
+// Converts SingleValueStmtExprs into UnspecifiedElements
+class Element extends @element {
+  string toString() { none() }
+}
+
+from Element e, string property, string error
+where
+  single_value_stmt_exprs(e, _) and
+  property = "" and
+  error = "Removed SingleValueStmtExpr during the database downgrade"
+  or
+  unspecified_elements(e, property, error)
+select e, property, error

swift/downgrades/fcc7b497930add320fabeed9b228b264bc847ae6/upgrade.properties

@@ -0,0 +1,5 @@
+description: Removing SingleValueStmtExpr
+compatibility: partial
+
+unspecified_elements.rel: run unspecified_elements.ql
+single_value_stmt_exprs.rel: delete

swift/extractor/infra/SwiftTagTraits.h

@@ -205,7 +205,7 @@ MAP(swift::Expr, ExprTag)
   MAP(swift::CopyExpr, void)  // TODO (introduced in 5.9)
   MAP(swift::ConsumeExpr, void)  // TODO (introduced in 5.9)
   MAP(swift::MaterializePackExpr, void)  // TODO (introduced in 5.9)
-  MAP(swift::SingleValueStmtExpr, void)  // TODO (introduced in 5.9)
+  MAP(swift::SingleValueStmtExpr, SingleValueStmtExprTag)
 #endif
 
 MAP(swift::Decl, DeclTag)

swift/extractor/translators/ExprTranslator.cpp

@@ -636,4 +636,11 @@ codeql::RegexLiteralExpr ExprTranslator::translateRegexLiteralExpr(
   return entry;
 }
 
+codeql::SingleValueStmtExpr ExprTranslator::translateSingleValueStmtExpr(
+    const swift::SingleValueStmtExpr& expr) {
+  auto entry = createExprEntry(expr);
+  entry.stmt = dispatcher.fetchLabel(expr.getStmt());
+  return entry;
+}
+
 }  // namespace codeql

swift/extractor/translators/ExprTranslator.h

@@ -119,6 +119,7 @@ class ExprTranslator : public AstTranslatorBase<ExprTranslator> {
   codeql::AppliedPropertyWrapperExpr translateAppliedPropertyWrapperExpr(
       const swift::AppliedPropertyWrapperExpr& expr);
   codeql::RegexLiteralExpr translateRegexLiteralExpr(const swift::RegexLiteralExpr& expr);
+  codeql::SingleValueStmtExpr translateSingleValueStmtExpr(const swift::SingleValueStmtExpr& expr);
 
  private:
   void fillClosureExpr(const swift::AbstractClosureExpr& expr, codeql::ClosureExpr& entry);

swift/ql/lib/change-notes/2023-11-08-swift-5.9.md

@@ -0,0 +1,5 @@
+---
+category: majorAnalysis
+---
+* Added Swift 5.9.1 support
+* New AST node is extracted: `SingleValueStmtExpr`

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

@@ -1417,6 +1417,15 @@ module Exprs {
     }
   }
 
+  /** Control-flow for a `SingleValueStmtExpr`. See the QLDoc for `SingleValueStmtExpr` for the semantics of a `SingleValueStmtExpr`. */
+  private class SingleValueStmtExprTree extends AstStandardPostOrderTree {
+    override SingleValueStmtExpr ast;
+
+    final override ControlFlowElement getChildElement(int i) {
+      i = 0 and result.asAstNode() = ast.getStmt()
+    }
+  }
+
   private class OpaqueValueExprTree extends AstLeafTree {
     override OpaqueValueExpr ast;
   }