Merge pull request github#12140 from github/redsun82/swift-fix-upgrade

Swift: remove query predicates in upgrade/downgrade scripts

Author: redsun82

swift/downgrades/15d0da3a76b9dbffb921ae6d585f8a8de8945a0b/iterable_decl_context_members.ql

@@ -1,5 +1,5 @@
 description: revert removal of IterableDeclContext
 compatibility: partial
 
-iterable_decl_context_members.rel: run iterable_decl_context_members.qlo
+iterable_decl_context_members.rel: reorder decl_members.rel (int id, int index, int member) id index member
 decl_members.rel: delete

swift/downgrades/15d0da3a76b9dbffb921ae6d585f8a8de8945a0b/upgrade.properties

@@ -2,5 +2,5 @@ description: Revert moving getName() from AbstractFunctionDecl to Callable
 compatibility: backwards
 
 // Rename callable_names to abstract_function_decls
-abstract_function_decls.rel: run abstract_function_decls.qlo
+abstract_function_decls.rel: reorder callable_names.rel (int id, string name) id name
 callable_names.rel: delete

swift/downgrades/5559b5a367524777b3f6ef3fc285ae81031ca1da/abstract_function_decls.ql

@@ -2,5 +2,5 @@ description: Move getName() from AbstractFunctionDecl to Callable
 compatibility: full
 
 // Rename abstract_function_decls to callable_names
-callable_names.rel: run callable_names.qlo
+callable_names.rel: reorder abstract_function_decls.rel (int id, string name) id name
 abstract_function_decls.rel: delete

swift/downgrades/5559b5a367524777b3f6ef3fc285ae81031ca1da/upgrade.properties

@@ -1,5 +1,5 @@
 description: remove IterableDeclContext
 compatibility: full
 
+decl_members.rel: reorder iterable_decl_context_members.rel (int id, int index, int member) id index member
 iterable_decl_context_members.rel: delete
-decl_members.rel: run decl_members.qlo