Swift: Update schema and update generated files.

Author: MathiasVP

swift/codegen/schema.yml

@@ -327,6 +327,9 @@ DeclRefExpr:
   _extends: Expr
   decl: Decl
   replacement_types: Type*
+  has_direct_to_storage_semantics: predicate
+  has_direct_to_implementation_semantics: predicate
+  has_ordinary_semantics: predicate
 
 DefaultArgumentExpr:
   _extends: Expr
@@ -404,6 +407,8 @@ LiteralExpr:
 
 LookupExpr:
   _extends: Expr
+  base_expr: Expr
+  member: Decl
 
 MakeTemporarilyEscapableExpr:
   _extends: Expr
@@ -653,6 +658,7 @@ AbstractFunctionDecl:
 
 AbstractStorageDecl:
   _extends: ValueDecl
+  accessor_decls: AccessorDecl*
 
 EnumElementDecl:
   _extends: ValueDecl
@@ -840,14 +846,17 @@ DynamicLookupExpr:
 
 MemberRefExpr:
   _extends: LookupExpr
-  base_expr: Expr
+  has_direct_to_storage_semantics: predicate
+  has_direct_to_implementation_semantics: predicate
+  has_ordinary_semantics: predicate
 
 SubscriptExpr:
   _extends:
-    - GenericContext
     - LookupExpr
-  base_expr: Expr
   arguments: Argument*
+  has_direct_to_storage_semantics: predicate
+  has_direct_to_implementation_semantics: predicate
+  has_ordinary_semantics: predicate
 
 OverloadedDeclRefExpr:
   _extends: OverloadSetRefExpr
@@ -927,7 +936,11 @@ FuncDecl:
   _extends: AbstractFunctionDecl
 
 SubscriptDecl:
-  _extends: AbstractStorageDecl
+  _extends:
+    - AbstractStorageDecl
+    - GenericContext
+  params: ParamDecl*
+  element_type: Type
 
 VarDecl:
   _extends: AbstractStorageDecl
@@ -1002,6 +1015,10 @@ WhileStmt:
 
 AccessorDecl:
   _extends: FuncDecl
+  is_getter: predicate
+  is_setter: predicate
+  is_will_set: predicate
+  is_did_set: predicate
 
 ConcreteFuncDecl:
   _extends: FuncDecl

swift/ql/lib/codeql/swift/generated/decl/AbstractStorageDecl.qll

@@ -1,4 +1,16 @@
 // generated by codegen/codegen.py
+import codeql.swift.elements.decl.AccessorDecl
 import codeql.swift.elements.decl.ValueDecl
 
-class AbstractStorageDeclBase extends @abstract_storage_decl, ValueDecl { }
+class AbstractStorageDeclBase extends @abstract_storage_decl, ValueDecl {
+  AccessorDecl getAccessorDecl(int index) {
+    exists(AccessorDecl x |
+      abstract_storage_decl_accessor_decls(this, index, x) and
+      result = x.resolve()
+    )
+  }
+
+  AccessorDecl getAnAccessorDecl() { result = getAccessorDecl(_) }
+
+  int getNumberOfAccessorDecls() { result = count(getAnAccessorDecl()) }
+}

swift/ql/lib/codeql/swift/generated/decl/AccessorDecl.qll

@@ -3,4 +3,12 @@ import codeql.swift.elements.decl.FuncDecl
 
 class AccessorDeclBase extends @accessor_decl, FuncDecl {
   override string getAPrimaryQlClass() { result = "AccessorDecl" }
+
+  predicate isGetter() { accessor_decl_is_getter(this) }
+
+  predicate isSetter() { accessor_decl_is_setter(this) }
+
+  predicate isWillSet() { accessor_decl_is_will_set(this) }
+
+  predicate isDidSet() { accessor_decl_is_did_set(this) }
 }

swift/ql/lib/codeql/swift/generated/decl/SubscriptDecl.qll

@@ -1,6 +1,27 @@
 // generated by codegen/codegen.py
 import codeql.swift.elements.decl.AbstractStorageDecl
+import codeql.swift.elements.decl.GenericContext
+import codeql.swift.elements.decl.ParamDecl
+import codeql.swift.elements.type.Type
 
-class SubscriptDeclBase extends @subscript_decl, AbstractStorageDecl {
+class SubscriptDeclBase extends @subscript_decl, AbstractStorageDecl, GenericContext {
   override string getAPrimaryQlClass() { result = "SubscriptDecl" }
+
+  ParamDecl getParam(int index) {
+    exists(ParamDecl x |
+      subscript_decl_params(this, index, x) and
+      result = x.resolve()
+    )
+  }
+
+  ParamDecl getAParam() { result = getParam(_) }
+
+  int getNumberOfParams() { result = count(getAParam()) }
+
+  Type getElementType() {
+    exists(Type x |
+      subscript_decls(this, x) and
+      result = x.resolve()
+    )
+  }
 }

swift/ql/lib/codeql/swift/generated/expr/DeclRefExpr.qll

@@ -23,4 +23,12 @@ class DeclRefExprBase extends @decl_ref_expr, Expr {
   Type getAReplacementType() { result = getReplacementType(_) }
 
   int getNumberOfReplacementTypes() { result = count(getAReplacementType()) }
+
+  predicate hasDirectToStorageSemantics() { decl_ref_expr_has_direct_to_storage_semantics(this) }
+
+  predicate hasDirectToImplementationSemantics() {
+    decl_ref_expr_has_direct_to_implementation_semantics(this)
+  }
+
+  predicate hasOrdinarySemantics() { decl_ref_expr_has_ordinary_semantics(this) }
 }

swift/ql/lib/codeql/swift/generated/expr/LookupExpr.qll

@@ -1,4 +1,19 @@
 // generated by codegen/codegen.py
+import codeql.swift.elements.decl.Decl
 import codeql.swift.elements.expr.Expr
 
-class LookupExprBase extends @lookup_expr, Expr { }
+class LookupExprBase extends @lookup_expr, Expr {
+  Expr getBaseExpr() {
+    exists(Expr x |
+      lookup_exprs(this, x, _) and
+      result = x.resolve()
+    )
+  }
+
+  Decl getMember() {
+    exists(Decl x |
+      lookup_exprs(this, _, x) and
+      result = x.resolve()
+    )
+  }
+}

swift/ql/lib/codeql/swift/generated/expr/MemberRefExpr.qll

@@ -1,14 +1,14 @@
 // generated by codegen/codegen.py
-import codeql.swift.elements.expr.Expr
 import codeql.swift.elements.expr.LookupExpr
 
 class MemberRefExprBase extends @member_ref_expr, LookupExpr {
   override string getAPrimaryQlClass() { result = "MemberRefExpr" }
 
-  Expr getBaseExpr() {
-    exists(Expr x |
-      member_ref_exprs(this, x) and
-      result = x.resolve()
-    )
+  predicate hasDirectToStorageSemantics() { member_ref_expr_has_direct_to_storage_semantics(this) }
+
+  predicate hasDirectToImplementationSemantics() {
+    member_ref_expr_has_direct_to_implementation_semantics(this)
   }
+
+  predicate hasOrdinarySemantics() { member_ref_expr_has_ordinary_semantics(this) }
 }

swift/ql/lib/codeql/swift/generated/expr/SubscriptExpr.qll

@@ -1,19 +1,10 @@
 // generated by codegen/codegen.py
 import codeql.swift.elements.expr.Argument
-import codeql.swift.elements.expr.Expr
-import codeql.swift.elements.decl.GenericContext
 import codeql.swift.elements.expr.LookupExpr
 
-class SubscriptExprBase extends @subscript_expr, GenericContext, LookupExpr {
+class SubscriptExprBase extends @subscript_expr, LookupExpr {
   override string getAPrimaryQlClass() { result = "SubscriptExpr" }
 
-  Expr getBaseExpr() {
-    exists(Expr x |
-      subscript_exprs(this, x) and
-      result = x.resolve()
-    )
-  }
-
   Argument getArgument(int index) {
     exists(Argument x |
       subscript_expr_arguments(this, index, x) and
@@ -24,4 +15,12 @@ class SubscriptExprBase extends @subscript_expr, GenericContext, LookupExpr {
   Argument getAnArgument() { result = getArgument(_) }
 
   int getNumberOfArguments() { result = count(getAnArgument()) }
+
+  predicate hasDirectToStorageSemantics() { subscript_expr_has_direct_to_storage_semantics(this) }
+
+  predicate hasDirectToImplementationSemantics() {
+    subscript_expr_has_direct_to_implementation_semantics(this)
+  }
+
+  predicate hasOrdinarySemantics() { subscript_expr_has_ordinary_semantics(this) }
 }

swift/ql/lib/swift.dbscheme

@@ -744,6 +744,21 @@ decl_ref_expr_replacement_types(
   int replacement_type: @type ref
 );
 
+#keyset[id]
+decl_ref_expr_has_direct_to_storage_semantics(
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_direct_to_implementation_semantics(
+  int id: @decl_ref_expr ref
+);
+
+#keyset[id]
+decl_ref_expr_has_ordinary_semantics(
+  int id: @decl_ref_expr ref
+);
+
 default_argument_exprs(
   unique int id: @default_argument_expr,
   int param_decl: @param_decl ref,
@@ -910,6 +925,13 @@ lazy_initializer_exprs(
 | @subscript_expr
 ;
 
+#keyset[id]
+lookup_exprs(
+  int id: @lookup_expr ref,
+  int base_expr: @expr ref,
+  int member: @decl ref
+);
+
 make_temporarily_escapable_exprs(
   unique int id: @make_temporarily_escapable_expr,
   int escaping_closure: @opaque_value_expr ref,
@@ -1365,6 +1387,13 @@ abstract_function_decl_params(
 | @var_decl
 ;
 
+#keyset[id, index]
+abstract_storage_decl_accessor_decls(
+  int id: @abstract_storage_decl ref,
+  int index: int ref,
+  int accessor_decl: @accessor_decl ref
+);
+
 enum_element_decls(
   unique int id: @enum_element_decl,
   string name: string ref
@@ -1670,13 +1699,26 @@ object_literal_exprs(
 ;
 
 member_ref_exprs(
-  unique int id: @member_ref_expr,
-  int base_expr: @expr ref
+  unique int id: @member_ref_expr
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_storage_semantics(
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_direct_to_implementation_semantics(
+  int id: @member_ref_expr ref
+);
+
+#keyset[id]
+member_ref_expr_has_ordinary_semantics(
+  int id: @member_ref_expr ref
 );
 
 subscript_exprs(
-  unique int id: @subscript_expr,
-  int base_expr: @expr ref
+  unique int id: @subscript_expr
 );
 
 #keyset[id, index]
@@ -1686,6 +1728,21 @@ subscript_expr_arguments(
   int argument: @argument ref
 );
 
+#keyset[id]
+subscript_expr_has_direct_to_storage_semantics(
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_direct_to_implementation_semantics(
+  int id: @subscript_expr ref
+);
+
+#keyset[id]
+subscript_expr_has_ordinary_semantics(
+  int id: @subscript_expr ref
+);
+
 overloaded_decl_ref_exprs(
   unique int id: @overloaded_decl_ref_expr
 );
@@ -1815,7 +1872,15 @@ destructor_decls(
 ;
 
 subscript_decls(
-  unique int id: @subscript_decl
+  unique int id: @subscript_decl,
+  int element_type: @type ref
+);
+
+#keyset[id, index]
+subscript_decl_params(
+  int id: @subscript_decl ref,
+  int index: int ref,
+  int param: @param_decl ref
 );
 
 @var_decl =
@@ -1857,7 +1922,7 @@ var_decl_parent_initializers(
   @abstract_function_decl
 | @extension_decl
 | @generic_type_decl
-| @subscript_expr
+| @subscript_decl
 ;
 
 #keyset[id, index]
@@ -1950,6 +2015,26 @@ accessor_decls(
   unique int id: @accessor_decl
 );
 
+#keyset[id]
+accessor_decl_is_getter(
+  int id: @accessor_decl ref
+);
+
+#keyset[id]
+accessor_decl_is_setter(
+  int id: @accessor_decl ref
+);
+
+#keyset[id]
+accessor_decl_is_will_set(
+  int id: @accessor_decl ref
+);
+
+#keyset[id]
+accessor_decl_is_did_set(
+  int id: @accessor_decl ref
+);
+
 concrete_func_decls(
   unique int id: @concrete_func_decl
 );