C++: Use SEH exception edges in IR and generate SEH exception edges for calls in __try blocks#19746
Merged
MathiasVP merged 7 commits intogithub:mainfrom Jun 16, 2025
Merged
C++: Use SEH exception edges in IR and generate SEH exception edges for calls in __try blocks#19746MathiasVP merged 7 commits intogithub:mainfrom
__try blocks#19746MathiasVP merged 7 commits intogithub:mainfrom
Conversation
jketema
changed the title
__try, __except, and __finally blocks__try blocks
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR shifts the IR’s exception modeling from generic “C++ Exception” edges to SEH-specific edges and extends QL IR translation to handle SEH exception edges for calls inside __try blocks.
- Updated test expectations to label and route SEH exception edges instead of “C++ Exception”
- Deprecated the old
ThrowingFunctioninterface and added anExceptionEdgeparameter to variousmayThrowException/mustThrowExceptionpredicates - Adjusted
TranslatedCall‐family QL classes to generate and propagate SEH edges
Reviewed Changes
Copilot reviewed 8 out of 8 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| cpp/ql/test/library-tests/ir/ir/raw_ir.expected | Replaced “C++ Exception” markers with “SEH Exception” in IR dump |
| cpp/ql/test/library-tests/ir/ir/raw_consistency.expected | Removed outdated consistency checks for C++ exception edges |
| cpp/ql/test/library-tests/ir/ir/aliased_ir.expected | Updated aliased IR tests to expect SEH Exception markers |
| cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll | Marked ThrowingFunction as deprecated |
| cpp/ql/lib/semmle/code/cpp/change-notes/2014-12-13-deprecate-throwing.md | Added deprecation note for ThrowingFunction |
| cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedFunction.qll | Adjusted call site to mayThrowException(_) |
| cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll | Updated mayThrowException/mustThrowException signatures |
| cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedCall.qll | Refactored exception‐edge predicates to take ExceptionEdge |
Comments suppressed due to low confidence (1)
cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll:18
- [nitpick] After deprecating
ThrowingFunction, update any references (e.g., inTranslatedFunctionCall) to preferAlwaysSehThrowingFunction, or clearly document when each should be used.
abstract deprecated class ThrowingFunction extends Function {
|
|
||
| final override predicate mayThrowException() { | ||
| expr.getTarget().(ThrowingFunction).mayThrowException(_) | ||
| final override predicate mayThrowException(ExceptionEdge e) { |
There was a problem hiding this comment.
The override for mayThrowException in TranslatedFunctionCall no longer delegates to ThrowingFunction for C++ exception edges. You should add a branch such as e instanceof CppExceptionEdge and expr.getTarget().(ThrowingFunction).mayThrowException(e) to restore C++ exception support.
Contributor
Author
There was a problem hiding this comment.
That's on purpose, Copilot.
Fix formatting while here.
MathiasVP
approved these changes
Jun 16, 2025
| this.mustThrowException(e) | ||
| or | ||
| exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt().getAChild*() = expr) and | ||
| exists(MicrosoftTryStmt tryStmt | tryStmt.getStmt() = expr.getEnclosingStmt().getParent*()) and |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.