Swift: Extract whether a function type is throwing or async.

MathiasVP · MathiasVP · commit 45bbd24355f2 · 2022-05-27T11:48:01.000+01:00
diff --git a/swift/codegen/schema.yml b/swift/codegen/schema.yml
@@ -63,6 +63,7 @@ AnyFunctionType:
   param_types: Type*
   param_labels: string*
   is_throwing: predicate
+  is_async: predicate
 
 AnyGenericType:
   _extends: Type
diff --git a/swift/extractor/visitors/TypeVisitor.h b/swift/extractor/visitors/TypeVisitor.h
@@ -211,6 +211,14 @@ class TypeVisitor : public TypeVisitorBase<TypeVisitor> {
       }
       ++i;
     }
+
+    if (type->isThrowing()) {
+      dispatcher_.emit(AnyFunctionTypeIsThrowingTrap{label});
+    }
+
+    if (type->isAsync()) {
+      dispatcher_.emit(AnyFunctionTypeIsAsyncTrap{label});
+    }
   }
 
   void emitBoundGenericType(swift::BoundGenericType* type, TrapLabel<BoundGenericTypeTag> label) {
diff --git a/swift/ql/lib/codeql/swift/generated/type/AnyFunctionType.qll b/swift/ql/lib/codeql/swift/generated/type/AnyFunctionType.qll
@@ -27,4 +27,6 @@ class AnyFunctionTypeBase extends @any_function_type, Type {
   int getNumberOfParamLabels() { result = count(getAParamLabel()) }
 
   predicate isThrowing() { any_function_type_is_throwing(this) }
+
+  predicate isAsync() { any_function_type_is_async(this) }
 }
diff --git a/swift/ql/lib/swift.dbscheme b/swift/ql/lib/swift.dbscheme
@@ -176,6 +176,11 @@ any_function_type_is_throwing(
   int id: @any_function_type ref
 );
 
+#keyset[id]
+any_function_type_is_async(
+  int id: @any_function_type ref
+);
+
 @any_generic_type =
   @nominal_or_bound_generic_nominal_type
 | @unbound_generic_type
diff --git a/swift/ql/test/extractor-tests/types/Types.expected b/swift/ql/test/extractor-tests/types/Types.expected
@@ -38,3 +38,4 @@
 | types.swift:21:10:21:10 | f | (Int) -> Int |
 | types.swift:21:10:21:13 | call to ... | Int |
 | types.swift:21:12:21:12 | x | Int |
+| types.swift:25:10:25:10 | 42 | Int |
diff --git a/swift/ql/test/extractor-tests/types/types.swift b/swift/ql/test/extractor-tests/types/types.swift
@@ -20,3 +20,11 @@ func f(x: Int, y: Int) -> Int {
 func g(_ f: (Int) -> Int, _ x: Int) -> Int {
   return f(x)
 }
+
+func throwingFunc() throws -> Int {
+  return 42
+}
+
+func asyncFunction(x: Int) async { }
+
+func throwingAndAsyncFunction(x: Int) async throws { }

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,14 @@ class TypeVisitor : public TypeVisitorBase<TypeVisitor> {`
`211`	`211`	`}`
`212`	`212`	`++i;`
`213`	`213`	`}`
	`214`	`+`
	`215`	`+ if (type->isThrowing()) {`
	`216`	`+ dispatcher_.emit(AnyFunctionTypeIsThrowingTrap{label});`
	`217`	`+ }`
	`218`	`+`
	`219`	`+ if (type->isAsync()) {`
	`220`	`+ dispatcher_.emit(AnyFunctionTypeIsAsyncTrap{label});`
	`221`	`+ }`
`214`	`222`	`}`
`215`	`223`
`216`	`224`	`void emitBoundGenericType(swift::BoundGenericType* type, TrapLabel<BoundGenericTypeTag> label) {`
Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,6 @@ class AnyFunctionTypeBase extends @any_function_type, Type {`
`27`	`27`	`int getNumberOfParamLabels() { result = count(getAParamLabel()) }`
`28`	`28`
`29`	`29`	`predicate isThrowing() { any_function_type_is_throwing(this) }`
	`30`	`+`
	`31`	`+ predicate isAsync() { any_function_type_is_async(this) }`
`30`	`32`	`}`