Swift: reorder generic type param children in nominal types

redsun82 · redsun82 · commit c0f477e5c15e · 2022-08-31T10:57:34.000+02:00
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -72,8 +72,8 @@ ExtensionDecl:
 
 NominalTypeDecl:
   _extends:
-    - IterableDeclContext
     - GenericTypeDecl
+    - IterableDeclContext
   type: Type
 
 AstNode:
diff --git a/swift/ql/lib/codeql/swift/generated/ParentChild.qll b/swift/ql/lib/codeql/swift/generated/ParentChild.qll
@@ -4650,21 +4650,21 @@ private module Impl {
   private Element getImmediateChildOfNominalTypeDecl(
     NominalTypeDecl e, int index, string partialPredicateCall
   ) {
-    exists(int b, int bIterableDeclContext, int bGenericTypeDecl, int n |
+    exists(int b, int bGenericTypeDecl, int bIterableDeclContext, int n |
       b = 0 and
-      bIterableDeclContext =
-        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfIterableDeclContext(e, i, _)) | i) and
       bGenericTypeDecl =
-        bIterableDeclContext + 1 +
-          max(int i | i = -1 or exists(getImmediateChildOfGenericTypeDecl(e, i, _)) | i) and
-      n = bGenericTypeDecl and
+        b + 1 + max(int i | i = -1 or exists(getImmediateChildOfGenericTypeDecl(e, i, _)) | i) and
+      bIterableDeclContext =
+        bGenericTypeDecl + 1 +
+          max(int i | i = -1 or exists(getImmediateChildOfIterableDeclContext(e, i, _)) | i) and
+      n = bIterableDeclContext and
       (
         none()
         or
-        result = getImmediateChildOfIterableDeclContext(e, index - b, partialPredicateCall)
+        result = getImmediateChildOfGenericTypeDecl(e, index - b, partialPredicateCall)
         or
         result =
-          getImmediateChildOfGenericTypeDecl(e, index - bIterableDeclContext, partialPredicateCall)
+          getImmediateChildOfIterableDeclContext(e, index - bGenericTypeDecl, partialPredicateCall)
       )
     )
   }
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -1480,7 +1480,7 @@ module Raw {
     string getStringValue() { integer_literal_exprs(this, result) }
   }
 
-  class NominalTypeDecl extends @nominal_type_decl, IterableDeclContext, GenericTypeDecl {
+  class NominalTypeDecl extends @nominal_type_decl, GenericTypeDecl, IterableDeclContext {
     Type getType() { nominal_type_decls(this, result) }
   }
 
diff --git a/swift/ql/lib/codeql/swift/generated/decl/NominalTypeDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/NominalTypeDecl.qll
@@ -5,7 +5,7 @@ import codeql.swift.elements.decl.GenericTypeDecl
 import codeql.swift.elements.decl.IterableDeclContext
 import codeql.swift.elements.type.Type
 
-class NominalTypeDeclBase extends Synth::TNominalTypeDecl, IterableDeclContext, GenericTypeDecl {
+class NominalTypeDeclBase extends Synth::TNominalTypeDecl, GenericTypeDecl, IterableDeclContext {
   Type getImmediateType() {
     result =
       Synth::convertTypeFromRaw(Synth::convertNominalTypeDeclToRaw(this)

Original file line number	Diff line number	Diff line change
`@@ -1480,7 +1480,7 @@ module Raw {`
`1480`	`1480`	`string getStringValue() { integer_literal_exprs(this, result) }`
`1481`	`1481`	`}`
`1482`	`1482`
`1483`		`- class NominalTypeDecl extends @nominal_type_decl, IterableDeclContext, GenericTypeDecl {`
	`1483`	`+ class NominalTypeDecl extends @nominal_type_decl, GenericTypeDecl, IterableDeclContext {`
`1484`	`1484`	`Type getType() { nominal_type_decls(this, result) }`
`1485`	`1485`	`}`
`1486`	`1486`