Swift: extract isInOut for parameters

Robert Marsh · web-flow · commit 776a2965caa6 · 2022-06-09T17:09:48.000Z
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -1103,6 +1103,7 @@ ConcreteVarDecl:
 
 ParamDecl:
   _extends: VarDecl
+  is_inout: predicate
 
 AssociatedTypeDecl:
   _extends: AbstractTypeParamDecl
diff --git a/swift/extractor/visitors/DeclVisitor.h b/swift/extractor/visitors/DeclVisitor.h
@@ -66,6 +66,9 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {
   void visitParamDecl(swift::ParamDecl* decl) {
     auto label = dispatcher_.assignNewLabel(decl);
     dispatcher_.emit(ParamDeclsTrap{label});
+    if (decl->isInOut()) {
+      dispatcher_.emit(ParamDeclIsInoutTrap{label});
+    }
     emitVarDecl(decl, label);
   }
 
diff --git a/swift/ql/lib/codeql/swift/generated/decl/ParamDecl.qll b/swift/ql/lib/codeql/swift/generated/decl/ParamDecl.qll
@@ -3,4 +3,6 @@ import codeql.swift.elements.decl.VarDecl
 
 class ParamDeclBase extends @param_decl, VarDecl {
   override string getAPrimaryQlClass() { result = "ParamDecl" }
+
+  predicate isInout() { param_decl_is_inout(this) }
 }
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
@@ -2062,6 +2062,11 @@ param_decls(
   unique int id: @param_decl
 );
 
+#keyset[id]
+param_decl_is_inout(
+  int id: @param_decl ref
+);
+
 associated_type_decls(
   unique int id: @associated_type_decl
 );

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,9 @@ class DeclVisitor : public AstVisitorBase<DeclVisitor> {`
`66`	`66`	`void visitParamDecl(swift::ParamDecl* decl) {`
`67`	`67`	`auto label = dispatcher_.assignNewLabel(decl);`
`68`	`68`	`dispatcher_.emit(ParamDeclsTrap{label});`
	`69`	`+ if (decl->isInOut()) {`
	`70`	`+ dispatcher_.emit(ParamDeclIsInoutTrap{label});`
	`71`	`+ }`
`69`	`72`	`emitVarDecl(decl, label);`
`70`	`73`	`}`
`71`	`74`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,6 @@ import codeql.swift.elements.decl.VarDecl`
`3`	`3`
`4`	`4`	`class ParamDeclBase extends @param_decl, VarDecl {`
`5`	`5`	`override string getAPrimaryQlClass() { result = "ParamDecl" }`
	`6`	`+`
	`7`	`+ predicate isInout() { param_decl_is_inout(this) }`
`6`	`8`	`}`