Merge branch 'codeql-cli-2.13.3' into redsun82/swift-hidden-ast

Author: redsun82

swift/downgrades/44e36e15e90bc1535964d9b86b3cd06a8b0d26e3/old.dbscheme

@@ -0,0 +1,2 @@
+description: Revert removing `getInterpolationCountExpr` and `getLiteralCapacityExpr` from `InterpolatedStringLiteralExpr`
+compatibility: backwards

swift/downgrades/44e36e15e90bc1535964d9b86b3cd06a8b0d26e3/swift.dbscheme

@@ -61,10 +61,6 @@ codeql::InterpolatedStringLiteralExpr ExprTranslator::translateInterpolatedStrin
     const swift::InterpolatedStringLiteralExpr& expr) {
   auto entry = createExprEntry(expr);
   entry.interpolation_expr = dispatcher.fetchOptionalLabel(expr.getInterpolationExpr());
-  // TODO we should be extracting getInterpolationCount and getLiteralCapacity directly to ints
-  // these expressions here are just an internal thing, the ints are actually directly available
-  entry.interpolation_count_expr = dispatcher.fetchOptionalLabel(expr.getInterpolationCountExpr());
-  entry.literal_capacity_expr = dispatcher.fetchOptionalLabel(expr.getLiteralCapacityExpr());
   entry.appending_expr = dispatcher.fetchOptionalLabel(expr.getAppendingExpr());
   return entry;
 }

swift/downgrades/44e36e15e90bc1535964d9b86b3cd06a8b0d26e3/upgrade.properties

@@ -0,0 +1,13 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+from Element i, string value
+where
+  integer_literal_exprs(i, value) and
+  not exists(Element interpolated |
+    interpolated_string_literal_expr_interpolation_count_exprs(interpolated, i)
+    or
+    interpolated_string_literal_expr_literal_capacity_exprs(interpolated, i)
+  )
+select i, value