Merge pull request github#8861 from MathiasVP/update-schema

Swift: Update `schema.yml` and regenerate files

Author: MathiasVP

swift/codegen/schema.yml

@@ -23,8 +23,8 @@ Locatable:
 
 Location:
   file: File
-  begin_line: int
-  begin_column: int
+  start_line: int
+  start_column: int
   end_line: int
   end_column: int
 
@@ -312,9 +312,12 @@ AssignExpr:
 
 BindOptionalExpr:
   _extends: Expr
+  sub_expr: Expr
 
 CaptureListExpr:
   _extends: Expr
+  binding_decls: PatternBindingDecl*
+  closure_body: ClosureExpr
 
 CodeCompletionExpr:
   _extends: Expr
@@ -338,15 +341,21 @@ DiscardAssignmentExpr:
 
 DotSyntaxBaseIgnoredExpr:
   _extends: Expr
+  qualifier: Expr
+  sub_expr: Expr
 
 DynamicTypeExpr:
   _extends: Expr
+  base_expr: Expr
 
 EditorPlaceholderExpr:
   _extends: Expr
 
 EnumIsCaseExpr:
   _extends: Expr
+  sub_expr: Expr
+  type_repr: TypeRepr
+  element: EnumElementDecl
 
 ErrorExpr:
   _extends: Expr
@@ -365,6 +374,9 @@ IdentityExpr:
 
 IfExpr:
   _extends: Expr
+  condition: Expr
+  then_expr: Expr
+  else_expr: Expr
 
 ImplicitConversionExpr:
   _extends: Expr
@@ -387,6 +399,7 @@ KeyPathExpr:
 
 LazyInitializerExpr:
   _extends: Expr
+  sub_expr: Expr
 
 LiteralExpr:
   _extends: Expr
@@ -396,21 +409,31 @@ LookupExpr:
 
 MakeTemporarilyEscapableExpr:
   _extends: Expr
+  escaping_closure: OpaqueValueExpr
+  nonescaping_closure: Expr
+  sub_expr: Expr
 
 ObjCSelectorExpr:
   _extends: Expr
+  sub_expr: Expr
+  method: AbstractFunctionDecl
 
 OneWayExpr:
   _extends: Expr
+  sub_expr: Expr
 
 OpaqueValueExpr:
   _extends: Expr
 
 OpenExistentialExpr:
   _extends: Expr
+  sub_expr: Expr
+  existential: Expr
+  opaque_expr: OpaqueValueExpr
 
 OptionalEvaluationExpr:
   _extends: Expr
+  sub_expr: Expr
 
 OtherConstructorDeclRefExpr:
   _extends: Expr
@@ -423,12 +446,15 @@ PropertyWrapperValuePlaceholderExpr:
 
 RebindSelfInConstructorExpr:
   _extends: Expr
+  sub_expr: Expr
+  self: VarDecl
 
 SequenceExpr:
   _extends: Expr
 
 SuperRefExpr:
   _extends: Expr
+  self: VarDecl
 
 TapExpr:
   _extends: Expr
@@ -438,14 +464,16 @@ TapExpr:
 
 TupleElementExpr:
   _extends: Expr
+  sub_expr: Expr
+  index: int
 
 TupleExpr:
   _extends: Expr
   elements: Expr*
 
 TypeExpr:
   _extends: Expr
-  type_repr: UnknownAstNode?
+  type_repr: TypeRepr?
 
 UnresolvedDeclRefExpr:
   _extends: Expr

swift/ql/lib/codeql/swift/generated/Location.qll

@@ -12,9 +12,9 @@ class LocationBase extends @location, Element {
     )
   }
 
-  int getBeginLine() { locations(this, _, result, _, _, _) }
+  int getStartLine() { locations(this, _, result, _, _, _) }
 
-  int getBeginColumn() { locations(this, _, _, result, _, _) }
+  int getStartColumn() { locations(this, _, _, result, _, _) }
 
   int getEndLine() { locations(this, _, _, _, result, _) }
 

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

@@ -3,4 +3,11 @@ import codeql.swift.elements.expr.Expr
 
 class BindOptionalExprBase extends @bind_optional_expr, Expr {
   override string toString() { result = "BindOptionalExpr" }
+
+  Expr getSubExpr() {
+    exists(Expr x |
+      bind_optional_exprs(this, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -1,6 +1,26 @@
 // generated by codegen/codegen.py
+import codeql.swift.elements.expr.ClosureExpr
 import codeql.swift.elements.expr.Expr
+import codeql.swift.elements.decl.PatternBindingDecl
 
 class CaptureListExprBase extends @capture_list_expr, Expr {
   override string toString() { result = "CaptureListExpr" }
+
+  PatternBindingDecl getBindingDecl(int index) {
+    exists(PatternBindingDecl x |
+      capture_list_expr_binding_decls(this, index, x) and
+      result = x.resolve()
+    )
+  }
+
+  PatternBindingDecl getABindingDecl() { result = getBindingDecl(_) }
+
+  int getNumberOfBindingDecls() { result = count(getABindingDecl()) }
+
+  ClosureExpr getClosureBody() {
+    exists(ClosureExpr x |
+      capture_list_exprs(this, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -3,4 +3,18 @@ import codeql.swift.elements.expr.Expr
 
 class DotSyntaxBaseIgnoredExprBase extends @dot_syntax_base_ignored_expr, Expr {
   override string toString() { result = "DotSyntaxBaseIgnoredExpr" }
+
+  Expr getQualifier() {
+    exists(Expr x |
+      dot_syntax_base_ignored_exprs(this, x, _) and
+      result = x.resolve()
+    )
+  }
+
+  Expr getSubExpr() {
+    exists(Expr x |
+      dot_syntax_base_ignored_exprs(this, _, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -3,4 +3,11 @@ import codeql.swift.elements.expr.Expr
 
 class DynamicTypeExprBase extends @dynamic_type_expr, Expr {
   override string toString() { result = "DynamicTypeExpr" }
+
+  Expr getBaseExpr() {
+    exists(Expr x |
+      dynamic_type_exprs(this, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -1,6 +1,29 @@
 // generated by codegen/codegen.py
+import codeql.swift.elements.decl.EnumElementDecl
 import codeql.swift.elements.expr.Expr
+import codeql.swift.elements.typerepr.TypeRepr
 
 class EnumIsCaseExprBase extends @enum_is_case_expr, Expr {
   override string toString() { result = "EnumIsCaseExpr" }
+
+  Expr getSubExpr() {
+    exists(Expr x |
+      enum_is_case_exprs(this, x, _, _) and
+      result = x.resolve()
+    )
+  }
+
+  TypeRepr getTypeRepr() {
+    exists(TypeRepr x |
+      enum_is_case_exprs(this, _, x, _) and
+      result = x.resolve()
+    )
+  }
+
+  EnumElementDecl getElement() {
+    exists(EnumElementDecl x |
+      enum_is_case_exprs(this, _, _, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -3,4 +3,25 @@ import codeql.swift.elements.expr.Expr
 
 class IfExprBase extends @if_expr, Expr {
   override string toString() { result = "IfExpr" }
+
+  Expr getCondition() {
+    exists(Expr x |
+      if_exprs(this, x, _, _) and
+      result = x.resolve()
+    )
+  }
+
+  Expr getThenExpr() {
+    exists(Expr x |
+      if_exprs(this, _, x, _) and
+      result = x.resolve()
+    )
+  }
+
+  Expr getElseExpr() {
+    exists(Expr x |
+      if_exprs(this, _, _, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -3,4 +3,11 @@ import codeql.swift.elements.expr.Expr
 
 class LazyInitializerExprBase extends @lazy_initializer_expr, Expr {
   override string toString() { result = "LazyInitializerExpr" }
+
+  Expr getSubExpr() {
+    exists(Expr x |
+      lazy_initializer_exprs(this, x) and
+      result = x.resolve()
+    )
+  }
 }

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

@@ -1,6 +1,28 @@
 // generated by codegen/codegen.py
 import codeql.swift.elements.expr.Expr
+import codeql.swift.elements.expr.OpaqueValueExpr
 
 class MakeTemporarilyEscapableExprBase extends @make_temporarily_escapable_expr, Expr {
   override string toString() { result = "MakeTemporarilyEscapableExpr" }
+
+  OpaqueValueExpr getEscapingClosure() {
+    exists(OpaqueValueExpr x |
+      make_temporarily_escapable_exprs(this, x, _, _) and
+      result = x.resolve()
+    )
+  }
+
+  Expr getNonescapingClosure() {
+    exists(Expr x |
+      make_temporarily_escapable_exprs(this, _, x, _) and
+      result = x.resolve()
+    )
+  }
+
+  Expr getSubExpr() {
+    exists(Expr x |
+      make_temporarily_escapable_exprs(this, _, _, x) and
+      result = x.resolve()
+    )
+  }
 }