Swift: add imported modules properties to ModuleDecl

redsun82 · redsun82 · commit 2e9d9cfb20d5 · 2022-08-26T11:23:02.000+02:00
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -1121,6 +1121,8 @@ ModuleDecl:
   _extends: TypeDecl
   is_builtin_module: predicate
   is_system_module: predicate
+  imported_modules: ModuleDecl*
+  exported_modules: ModuleDecl*
 
 ConstructorRefCallExpr:
   _extends: SelfApplyExpr
diff --git a/swift/ql/lib/codeql/swift/generated/Raw.qll b/swift/ql/lib/codeql/swift/generated/Raw.qll
@@ -1398,6 +1398,10 @@ module Raw {
     predicate isBuiltinModule() { module_decl_is_builtin_module(this) }
 
     predicate isSystemModule() { module_decl_is_system_module(this) }
+
+    ModuleDecl getImportedModule(int index) { module_decl_imported_modules(this, index, result) }
+
+    ModuleDecl getExportedModule(int index) { module_decl_exported_modules(this, index, result) }
   }
 
   class NumberLiteralExpr extends @number_literal_expr, BuiltinLiteralExpr { }
diff --git a/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/ModuleDecl.qll
@@ -1,6 +1,7 @@
 // generated by codegen/codegen.py
 private import codeql.swift.generated.Synth
 private import codeql.swift.generated.Raw
+import codeql.swift.elements.decl.ModuleDecl
 import codeql.swift.elements.decl.TypeDecl
 
 class ModuleDeclBase extends Synth::TModuleDecl, TypeDecl {
@@ -13,4 +14,34 @@ class ModuleDeclBase extends Synth::TModuleDecl, TypeDecl {
   predicate isSystemModule() {
     Synth::convertModuleDeclToRaw(this).(Raw::ModuleDecl).isSystemModule()
   }
+
+  ModuleDecl getImmediateImportedModule(int index) {
+    result =
+      Synth::convertModuleDeclFromRaw(Synth::convertModuleDeclToRaw(this)
+            .(Raw::ModuleDecl)
+            .getImportedModule(index))
+  }
+
+  final ModuleDecl getImportedModule(int index) {
+    result = getImmediateImportedModule(index).resolve()
+  }
+
+  final ModuleDecl getAnImportedModule() { result = getImportedModule(_) }
+
+  final int getNumberOfImportedModules() { result = count(getAnImportedModule()) }
+
+  ModuleDecl getImmediateExportedModule(int index) {
+    result =
+      Synth::convertModuleDeclFromRaw(Synth::convertModuleDeclToRaw(this)
+            .(Raw::ModuleDecl)
+            .getExportedModule(index))
+  }
+
+  final ModuleDecl getExportedModule(int index) {
+    result = getImmediateExportedModule(index).resolve()
+  }
+
+  final ModuleDecl getAnExportedModule() { result = getExportedModule(_) }
+
+  final int getNumberOfExportedModules() { result = count(getAnExportedModule()) }
 }
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
@@ -2116,6 +2116,20 @@ module_decl_is_system_module(  //dir=decl
   int id: @module_decl ref
 );
 
+#keyset[id, index]
+module_decl_imported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int index: int ref,
+  int imported_module: @module_decl ref
+);
+
+#keyset[id, index]
+module_decl_exported_modules(  //dir=decl
+  int id: @module_decl ref,
+  int index: int ref,
+  int exported_module: @module_decl ref
+);
+
 constructor_ref_call_exprs(  //dir=expr
   unique int id: @constructor_ref_call_expr
 );
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getExportedModule.ql b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getExportedModule.ql
@@ -0,0 +1,7 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from ModuleDecl x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getExportedModule(index)
diff --git a/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getImportedModule.ql b/swift/ql/test/extractor-tests/generated/decl/ModuleDecl/ModuleDecl_getImportedModule.ql
@@ -0,0 +1,7 @@
+// generated by codegen/codegen.py
+import codeql.swift.elements
+import TestUtils
+
+from ModuleDecl x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getImportedModule(index)

Original file line number	Diff line number	Diff line change
`@@ -1398,6 +1398,10 @@ module Raw {`
`1398`	`1398`	`predicate isBuiltinModule() { module_decl_is_builtin_module(this) }`
`1399`	`1399`
`1400`	`1400`	`predicate isSystemModule() { module_decl_is_system_module(this) }`
	`1401`	`+`
	`1402`	`+ ModuleDecl getImportedModule(int index) { module_decl_imported_modules(this, index, result) }`
	`1403`	`+`
	`1404`	`+ ModuleDecl getExportedModule(int index) { module_decl_exported_modules(this, index, result) }`
`1401`	`1405`	`}`
`1402`	`1406`
`1403`	`1407`	`class NumberLiteralExpr extends @number_literal_expr, BuiltinLiteralExpr { }`