Unified: Regenerate AST library, dbscheme and test outputs

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: paldepind

unified/extractor/tests/corpus/swift/functions/attributed-parameter-types.output

@@ -186,26 +186,53 @@ top_level source="⟨body⟩"
           parameter:
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "a" source="a"
-              type: unsupported_node "inout D" source="inout D"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "inout" source="inout"
+                  type: identifier "D" source="D"
               pattern: identifier "a" source="a"
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "b" source="b"
-              type: unsupported_node "sending T" source="sending T"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "sending" source="sending"
+                  type: identifier "T" source="T"
               pattern: identifier "b" source="b"
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "c" source="c"
-              type: unsupported_node "borrowing T" source="borrowing T"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "borrowing" source="borrowing"
+                  type: identifier "T" source="T"
               pattern: identifier "c" source="c"
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "d" source="d"
-              type: unsupported_node "consuming T" source="consuming T"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "consuming" source="consuming"
+                  type: identifier "T" source="T"
               pattern: identifier "d" source="d"
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "e" source="e"
-              type: unsupported_node "@escaping (T) -> Void" source="@escaping (T) -> Void"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "@escaping" source="@escaping"
+                  type:
+                    function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
+                      parameter:
+                        parameter source="⟨type⟩"
+                          type: identifier "T" source="T"
+                      return_type: identifier "Void" source="Void"
               pattern: identifier "e" source="e"
             parameter source="⟨external_name_node⟩⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "g" source="g"
-              type: unsupported_node "@Sendable @escaping () -> D" source="@Sendable @escaping () -> D"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨modifier⟩ ⟨type⟩"
+                  modifier:
+                    modifier "@Sendable" source="@Sendable"
+                    modifier "@escaping" source="@escaping"
+                  type:
+                    function_expr source="() -> ⟨return_type⟩"
+                      return_type: identifier "D" source="D"
               pattern: identifier "g" source="g"
           body: block "{}" source="{}"

unified/extractor/tests/corpus/swift/functions/function-with-inout-parameter.output

@@ -66,7 +66,10 @@ top_level source="⟨body⟩"
           parameter:
             parameter source="⟨external_name_node⟩ ⟨pattern⟩: ⟨type⟩"
               external_name_node: identifier "_" source="_"
-              type: unsupported_node "inout Int" source="inout Int"
+              type:
+                modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                  modifier: modifier "inout" source="inout"
+                  type: identifier "Int" source="Int"
               pattern: identifier "x" source="x"
           body:
             block source="{\n  ⟨stmt⟩\n}"

unified/extractor/tests/corpus/swift/types/function-type-with-convention-attribute.output

@@ -65,7 +65,12 @@ top_level source="⟨body⟩"
         variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
           modifier: modifier "let" source="let"
           pattern: identifier "callback" source="callback"
-          type: unsupported_node "@convention(c) () -> Void" source="@convention(c) () -> Void"
+          type:
+            modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+              modifier: modifier "@convention(c)" source="@convention(c)"
+              type:
+                function_expr source="() -> ⟨return_type⟩"
+                  return_type: identifier "Void" source="Void"
           value:
             function_expr source="{}"
               body: block source=""

unified/extractor/tests/corpus/swift/types/function-type-with-inout-parameter.output

@@ -70,7 +70,10 @@ top_level source="⟨body⟩"
             function_expr source="(⟨parameter⟩) -> ⟨return_type⟩"
               parameter:
                 parameter source="⟨type⟩"
-                  type: unsupported_node "inout Int" source="inout Int"
+                  type:
+                    modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+                      modifier: modifier "inout" source="inout"
+                      type: identifier "Int" source="Int"
               return_type: identifier "Void" source="Void"
           value:
             function_expr source="{ ⟨parameter⟩ in }"

unified/extractor/tests/corpus/swift/types/function-type-with-sendable-attribute.output

@@ -58,7 +58,12 @@ top_level source="⟨body⟩"
         variable_declaration source="⟨modifier⟩ ⟨pattern⟩: ⟨type⟩ = ⟨value⟩"
           modifier: modifier "let" source="let"
           pattern: identifier "handler" source="handler"
-          type: unsupported_node "@Sendable () -> Void" source="@Sendable () -> Void"
+          type:
+            modified_type_expr source="⟨modifier⟩ ⟨type⟩"
+              modifier: modifier "@Sendable" source="@Sendable"
+              type:
+                function_expr source="() -> ⟨return_type⟩"
+                  return_type: identifier "Void" source="Void"
           value:
             function_expr source="{}"
               body: block source=""

unified/ql/lib/codeql/unified/internal/Ast.qll

@@ -1041,6 +1041,27 @@ module Unified {
     }
   }
 
+  /** A class representing `modified_type_expr` nodes. */
+  class ModifiedTypeExpr extends @unified_modified_type_expr, F::Expr {
+    /** Gets the name of the primary QL class for this element. */
+    final override string getAPrimaryQlClass() { result = "ModifiedTypeExpr" }
+
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getModifier(int i) { unified_modified_type_expr_modifier(this, i, result) }
+
+    /** Gets the node corresponding to the field `modifier`. */
+    final F::Modifier getAModifier() { result = this.getModifier(_) }
+
+    /** Gets the node corresponding to the field `type`. */
+    final F::Expr getType() { unified_modified_type_expr_def(this, result) }
+
+    /** Gets a field or child node of this node. */
+    final override F::AstNode getAFieldOrChild() {
+      unified_modified_type_expr_modifier(this, _, result) or
+      unified_modified_type_expr_def(this, result)
+    }
+  }
+
   /** A class representing `modifier` tokens. */
   class Modifier extends @unified_token_modifier, F::AstNode, F::Token {
     /** Gets the name of the primary QL class for this element. */
@@ -1781,6 +1802,10 @@ module Unified {
       or
       result = node.(MemberAccessExpr).getMemberNameNode() and i = -1 and name = "getMemberNameNode"
       or
+      result = node.(ModifiedTypeExpr).getModifier(i) and name = "getModifier"
+      or
+      result = node.(ModifiedTypeExpr).getType() and i = -1 and name = "getType"
+      or
       result = node.(NamedPattern).getModifier(i) and name = "getModifier"
       or
       result = node.(NamedPattern).getNameNode() and i = -1 and name = "getNameNode"
@@ -2004,6 +2029,8 @@ module UnifiedFinal {
 
   final class MemberAccessExpr = F::MemberAccessExpr;
 
+  final class ModifiedTypeExpr = F::ModifiedTypeExpr;
+
   final class Modifier = F::Modifier;
 
   final class NamedPattern = F::NamedPattern;

unified/ql/lib/unified.dbscheme

@@ -440,7 +440,7 @@ unified_equality_type_constraint_def(
   int right: @unified_expr ref
 );
 
-@unified_expr = @unified_array_literal | @unified_binary_expr | @unified_block | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_conditional_pattern | @unified_continue_expr | @unified_expr_pattern | @unified_function_expr | @unified_generic_type_expr | @unified_if_expr | @unified_key_value_pair | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_named_pattern | @unified_or_pattern | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_expr | @unified_throw_expr | @unified_token_boolean_literal | @unified_token_builtin_expr | @unified_token_empty_expr | @unified_token_float_literal | @unified_token_identifier | @unified_token_ignore_pattern | @unified_token_inferred_type_expr | @unified_token_int_literal | @unified_token_regex_literal | @unified_token_string_literal | @unified_token_super_expr | @unified_token_unhandled_node | @unified_token_unsupported_node | @unified_try_expr | @unified_tuple_expr | @unified_type_cast_expr | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence
+@unified_expr = @unified_array_literal | @unified_binary_expr | @unified_block | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_conditional_pattern | @unified_continue_expr | @unified_expr_pattern | @unified_function_expr | @unified_generic_type_expr | @unified_if_expr | @unified_key_value_pair | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_modified_type_expr | @unified_named_pattern | @unified_or_pattern | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_expr | @unified_throw_expr | @unified_token_boolean_literal | @unified_token_builtin_expr | @unified_token_empty_expr | @unified_token_float_literal | @unified_token_identifier | @unified_token_ignore_pattern | @unified_token_inferred_type_expr | @unified_token_int_literal | @unified_token_regex_literal | @unified_token_string_literal | @unified_token_super_expr | @unified_token_unhandled_node | @unified_token_unsupported_node | @unified_try_expr | @unified_tuple_expr | @unified_type_cast_expr | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence
 
 @unified_expr_or_operator = @unified_expr | @unified_token_infix_operator
 
@@ -669,6 +669,18 @@ unified_member_access_expr_def(
   int member_name_node: @unified_token_identifier ref
 );
 
+#keyset[unified_modified_type_expr, index]
+unified_modified_type_expr_modifier(
+  int unified_modified_type_expr: @unified_modified_type_expr ref,
+  int index: int ref,
+  unique int modifier: @unified_token_modifier ref
+);
+
+unified_modified_type_expr_def(
+  unique int id: @unified_modified_type_expr,
+  int type__: @unified_expr ref
+);
+
 #keyset[unified_named_pattern, index]
 unified_named_pattern_modifier(
   int unified_named_pattern: @unified_named_pattern ref,
@@ -1025,7 +1037,7 @@ unified_trivia_tokeninfo(
   string value: string ref
 );
 
-@unified_ast_node = @unified_accessor_declaration | @unified_argument | @unified_array_literal | @unified_associated_type_declaration | @unified_base_type | @unified_binary_expr | @unified_block | @unified_bound_type_constraint | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_catch_clause | @unified_class_like_declaration | @unified_conditional_pattern | @unified_constructor_declaration | @unified_continue_expr | @unified_defer_stmt | @unified_destructor_declaration | @unified_do_while_stmt | @unified_equality_type_constraint | @unified_expr_pattern | @unified_for_each_stmt | @unified_function_declaration | @unified_function_expr | @unified_generic_type_expr | @unified_guard_if_stmt | @unified_if_expr | @unified_import_declaration | @unified_initializer_declaration | @unified_key_value_pair | @unified_labeled_stmt | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_named_pattern | @unified_operator_syntax_declaration | @unified_or_pattern | @unified_parameter | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_case | @unified_switch_expr | @unified_throw_expr | @unified_token | @unified_top_level | @unified_trivia_token | @unified_try_expr | @unified_tuple_expr | @unified_type_alias_declaration | @unified_type_cast_expr | @unified_type_parameter | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence | @unified_variable_declaration | @unified_while_stmt
+@unified_ast_node = @unified_accessor_declaration | @unified_argument | @unified_array_literal | @unified_associated_type_declaration | @unified_base_type | @unified_binary_expr | @unified_block | @unified_bound_type_constraint | @unified_break_expr | @unified_bulk_importing_pattern | @unified_call_expr | @unified_catch_clause | @unified_class_like_declaration | @unified_conditional_pattern | @unified_constructor_declaration | @unified_continue_expr | @unified_defer_stmt | @unified_destructor_declaration | @unified_do_while_stmt | @unified_equality_type_constraint | @unified_expr_pattern | @unified_for_each_stmt | @unified_function_declaration | @unified_function_expr | @unified_generic_type_expr | @unified_guard_if_stmt | @unified_if_expr | @unified_import_declaration | @unified_initializer_declaration | @unified_key_value_pair | @unified_labeled_stmt | @unified_macro_call_expr | @unified_map_literal | @unified_member_access_expr | @unified_modified_type_expr | @unified_named_pattern | @unified_operator_syntax_declaration | @unified_or_pattern | @unified_parameter | @unified_pattern_guard_expr | @unified_return_expr | @unified_string_interpolation_expr | @unified_switch_case | @unified_switch_expr | @unified_throw_expr | @unified_token | @unified_top_level | @unified_trivia_token | @unified_try_expr | @unified_tuple_expr | @unified_type_alias_declaration | @unified_type_cast_expr | @unified_type_parameter | @unified_type_test_expr | @unified_unary_expr | @unified_unresolved_operator_sequence | @unified_variable_declaration | @unified_while_stmt
 
 unified_ast_node_location(
   unique int node: @unified_ast_node ref,

unified/ql/test/library-tests/controlflow/cfg.expected

@@ -157,6 +157,7 @@ noCfg
 | cfg.swift:468:6:468:17 | testIfConfig |
 | cfg.swift:497:6:497:18 | testAvailable |
 | cfg.swift:524:6:524:17 | testAsyncFor |
+| cfg.swift:555:49:555:51 | Int |
 | cfg.swift:559:6:559:20 | autoclosureTest |
 nonSimple
 | cfg.swift:12:17:12:25 | withParam | 'withParam -? Block' |

unified/ql/test/library-tests/controlflow/cfg.swift

@@ -552,7 +552,7 @@ func testNilCoalescing2(x: Bool?) -> Int {
   }
 }
 
-func usesAutoclosure(_ expr: @autoclosure () -> Int) -> Int {
+func usesAutoclosure(_ expr: @autoclosure () -> Int) -> Int { // $ noCfg
   return expr()
 }