Skip to content

Swift: Make DoCatchTree more precise #13114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Swift: Make DoCatchTree more precise #13114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions swift/ql/lib/codeql/swift/controlflow/internal/ControlFlowGraphImpl.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,8 +767,7 @@ module Stmts {
astLast(ast.getACatch().getBody(), last, c)
or
// We failed to match on any of the clauses.
// TODO: This can actually only happen if the enclosing function is marked with 'throws'.
// So we could make this more precise.
ast.getEnclosingFunction().isThrowing() and
astLast(ast.getLastCatch(), last, c) and
c = any(MatchingCompletion mc | not mc.isMatch())
}
Expand Down
15 changes: 14 additions & 1 deletion swift/ql/lib/codeql/swift/elements/decl/Function.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
private import swift
private import codeql.swift.generated.decl.Function
private import codeql.swift.elements.decl.Method

/**
* A function.
*/
class Function extends Generated::Function, Callable {
override string toString() { result = this.getName() }

/**
* Holds if this is a throwing function.
*
* For example, this function is a throwing function:
*
* ```swift
* func myFunc() throws -> String {
* // ...
* }
* ```
*/
predicate isThrowing() { this.getInterfaceType().(AnyFunctionType).isThrowing() }
}

/**
Expand Down