Merge pull request #10210 from github/redsun82/swift-fix-double-parent

redsun82 · web-flow · commit f14f9375e072 · 2022-08-29T17:27:57.000+02:00
Swift: fix double parent
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -80,8 +80,8 @@ AstNode:
 
 Callable:
   _children:
-    params: ParamDecl*
     self_param: ParamDecl?
+    params: ParamDecl*
     body: BraceStmt?
 
 ConditionElement:
@@ -545,7 +545,7 @@ RebindSelfInConstructorExpr:
   _extends: Expr
   _children:
     sub_expr: Expr
-    self: VarDecl
+  self: VarDecl
 
 SequenceExpr:
   _extends: Expr
diff --git a/swift/ql/lib/codeql/swift/generated/Callable.qll b/swift/ql/lib/codeql/swift/generated/Callable.qll
@@ -6,29 +6,29 @@ import codeql.swift.elements.Element
 import codeql.swift.elements.decl.ParamDecl
 
 class CallableBase extends Synth::TCallable, Element {
-  ParamDecl getImmediateParam(int index) {
+  ParamDecl getImmediateSelfParam() {
     result =
       Synth::convertParamDeclFromRaw(Synth::convertCallableToRaw(this)
             .(Raw::Callable)
-            .getParam(index))
+            .getSelfParam())
   }
 
-  final ParamDecl getParam(int index) { result = getImmediateParam(index).resolve() }
-
-  final ParamDecl getAParam() { result = getParam(_) }
+  final ParamDecl getSelfParam() { result = getImmediateSelfParam().resolve() }
 
-  final int getNumberOfParams() { result = count(getAParam()) }
+  final predicate hasSelfParam() { exists(getSelfParam()) }
 
-  ParamDecl getImmediateSelfParam() {
+  ParamDecl getImmediateParam(int index) {
     result =
       Synth::convertParamDeclFromRaw(Synth::convertCallableToRaw(this)
             .(Raw::Callable)
-            .getSelfParam())
+            .getParam(index))
   }
 
-  final ParamDecl getSelfParam() { result = getImmediateSelfParam().resolve() }
+  final ParamDecl getParam(int index) { result = getImmediateParam(index).resolve() }
 
-  final predicate hasSelfParam() { exists(getSelfParam()) }
+  final ParamDecl getAParam() { result = getParam(_) }
+
+  final int getNumberOfParams() { result = count(getAParam()) }
 
   BraceStmt getImmediateBody() {
     result =
diff --git a/swift/ql/lib/codeql/swift/generated/GetImmediateParent.qll b/swift/ql/lib/codeql/swift/generated/GetImmediateParent.qll
@@ -13,10 +13,10 @@ Element getAnImmediateChild(Element e) {
   // * none() simplifies generation, as we can append `or ...` without a special case for the first item
   none()
   or
-  result = e.(Callable).getImmediateParam(_)
-  or
   result = e.(Callable).getImmediateSelfParam()
   or
+  result = e.(Callable).getImmediateParam(_)
+  or
   result = e.(Callable).getImmediateBody()
   or
   result = e.(AbstractStorageDecl).getImmediateAccessorDecl(_)
@@ -123,8 +123,6 @@ Element getAnImmediateChild(Element e) {
   or
   result = e.(RebindSelfInConstructorExpr).getImmediateSubExpr()
   or
-  result = e.(RebindSelfInConstructorExpr).getImmediateSelf()
-  or
   result = e.(SelfApplyExpr).getImmediateBase()
   or
   result = e.(SequenceExpr).getImmediateElement(_)
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -6,10 +6,10 @@ module Raw {
   }
 
   class Callable extends @callable, Element {
-    ParamDecl getParam(int index) { callable_params(this, index, result) }
-
     ParamDecl getSelfParam() { callable_self_params(this, result) }
 
+    ParamDecl getParam(int index) { callable_params(this, index, result) }
+
     BraceStmt getBody() { callable_bodies(this, result) }
   }
 
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
@@ -166,19 +166,19 @@ nominal_type_decls(  //dir=decl
 | @abstract_function_decl
 ;
 
+#keyset[id]
+callable_self_params(
+  int id: @callable ref,
+  int self_param: @param_decl ref
+);
+
 #keyset[id, index]
 callable_params(
   int id: @callable ref,
   int index: int ref,
   int param: @param_decl ref
 );
 
-#keyset[id]
-callable_self_params(
-  int id: @callable ref,
-  int self_param: @param_decl ref
-);
-
 #keyset[id]
 callable_bodies(
   int id: @callable ref,
diff --git a/swift/ql/test/library-tests/parent/no_double_parents.expected b/swift/ql/test/library-tests/parent/no_double_parents.expected
@@ -1,2 +0,0 @@
-| ConstructorDecl | RebindSelfInConstructorExpr | ParamDecl |
-| RebindSelfInConstructorExpr | ConstructorDecl | ParamDecl |
diff --git a/swift/ql/test/library-tests/parent/parent.expected b/swift/ql/test/library-tests/parent/parent.expected
@@ -623,6 +623,7 @@
 | expressions.swift:77:21:77:21 | init | ConstructorDecl | expressions.swift:77:21:77:21 | self | ParamDecl |
 | expressions.swift:77:21:77:21 | init | ConstructorDecl | file://:0:0:0:0 | x | ParamDecl |
 | expressions.swift:77:21:77:21 | init | ConstructorDecl | file://:0:0:0:0 | { ... } | BraceStmt |
+| expressions.swift:78:3:80:3 | init | ConstructorDecl | expressions.swift:78:3:78:3 | self | ParamDecl |
 | expressions.swift:78:3:80:3 | init | ConstructorDecl | expressions.swift:78:10:80:3 | { ... } | BraceStmt |
 | expressions.swift:78:10:80:3 | { ... } | BraceStmt | expressions.swift:79:5:79:21 | self = ... | RebindSelfInConstructorExpr |
 | expressions.swift:78:10:80:3 | { ... } | BraceStmt | expressions.swift:80:3:80:3 | return | ReturnStmt |

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@ module Raw {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`class Callable extends @callable, Element {`
`9`		`- ParamDecl getParam(int index) { callable_params(this, index, result) }`
`10`		`-`
`11`	`9`	`ParamDecl getSelfParam() { callable_self_params(this, result) }`
`12`	`10`
	`11`	`+ ParamDecl getParam(int index) { callable_params(this, index, result) }`
	`12`	`+`
`13`	`13`	`BraceStmt getBody() { callable_bodies(this, result) }`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-\| ConstructorDecl \| RebindSelfInConstructorExpr \| ParamDecl \|`
`2`		`-\| RebindSelfInConstructorExpr \| ConstructorDecl \| ParamDecl \|`