Skip to content

C#: Replace old Guards with the new shared implementation. #20665

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

Merged
merged 16 commits into from
Oct 31, 2025
Merged

C#: Replace old Guards with the new shared implementation. #20665

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9776e8f
C#: Remove an irrelevant reference to impliesStep.
aschackmull Oct 15, 2025
e3fc319
C#: Remove tests referencing impliesStep.
aschackmull Oct 15, 2025
1aa0e7c
C#: Make private.
aschackmull Oct 15, 2025
46fc006
C#: Update NullCheck test to reflect what nullness use.
aschackmull Oct 17, 2025
dc4abc9
C#: Replace references to getANullCheck.
aschackmull Oct 17, 2025
84b8b1c
C#: Minor test tweak.
aschackmull Oct 17, 2025
8b3e626
Guards: Only prune actually trivial guards.
aschackmull Oct 21, 2025
7241bed
C#: Replace Guards with the new implementation.
aschackmull Oct 21, 2025
cbfb8fd
C#: Accept some test changes.
aschackmull Oct 21, 2025
0df0816
Guards: Minor improvement to implications.
aschackmull Oct 29, 2025
72f1fe5
C#: Exclude nullness sources that are deemed non-null.
aschackmull Oct 29, 2025
500fdb8
Guards: Add support for assertions that exit rather than throw.
aschackmull Oct 27, 2025
b48d4d4
C#: Recognize assertions as Guards.
aschackmull Oct 27, 2025
e61ddf5
C#: Remove assertion splitting.
aschackmull Oct 27, 2025
87d89fd
C#: Fix CFG for assertion.
aschackmull Oct 28, 2025
900d0d2
C#: Accept test changes for assert split removal.
aschackmull Oct 29, 2025
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
14 changes: 10 additions & 4 deletions shared/controlflow/codeql/controlflow/Guards.qll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,12 @@ module Make<
v.asConstantValue() = c.asConstantValue()
}

private predicate trivialHasValue(Expr e, GuardValue v) {
constantHasValue(e, v)
or
e instanceof NonNullExpr and v.isNonNullValue()
}

private predicate exceptionBranchPoint(BasicBlock bb1, BasicBlock normalSucc, BasicBlock excSucc) {
exists(SuccessorType norm, ExceptionSuccessor exc |
bb1.getASuccessor(norm) = normalSucc and
Expand Down Expand Up @@ -815,7 +821,7 @@ module Make<
v2.isNonNullValue()
)
) and
not exprHasValue(g2, v2) // disregard trivial guard
not trivialHasValue(g2, v2) // disregard trivial guard
}

bindingset[g1, v1]
Expand All @@ -838,7 +844,7 @@ module Make<
// g1 === ... ? e : g2
g2 = getBranchExpr(cond, branch.booleanNot()) and
v2 = v1 and
not exprHasValue(g2, v2) // disregard trivial guard
not trivialHasValue(g2, v2) // disregard trivial guard
)
}

Expand All @@ -847,7 +853,7 @@ module Make<
private predicate impliesStepSsaGuard(SsaDefinition def1, GuardValue v1, Guard g2, GuardValue v2) {
def1.(SsaExplicitWrite).getValue() = g2 and
v1 = v2 and
not exprHasValue(g2, v2) // disregard trivial guard
not trivialHasValue(g2, v2) // disregard trivial guard
or
exists(Expr e, GuardValue ev |
guardDeterminesPhiInput(g2, v2.getDualValue(), def1, e) and
Expand Down Expand Up @@ -1097,7 +1103,7 @@ module Make<
call.getMethod() = wrapperGuard(ppos, v1, v2) and
call.getArgument(apos) = g2 and
parameterMatch(pragma[only_bind_out](ppos), pragma[only_bind_out](apos)) and
not exprHasValue(g2, v2) // disregard trivial guard
not trivialHasValue(g2, v2) // disregard trivial guard
)
}
}
Expand Down