Skip to content

FwdChecker: Avoid re-checking locals because of global dependencies #2117

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

Open
michael-schwarz wants to merge 3 commits into
base: fwd_constrsys_new
Choose a base branch
from
Open

FwdChecker: Avoid re-checking locals because of global dependencies #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04afebe
FwdChecker: Avoid re-checking locals because of global dependencies
michael-schwarz Aug 26, 2026
c8f6792
Simplify
michael-schwarz Aug 26, 2026
871fdf0
CIL fixes
michael-schwarz Aug 26, 2026
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
6 changes: 4 additions & 2 deletions src/solver/fwdCommon.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,9 @@ module Checker (System: FwdGlobConstrSys)
module GM = Gbl.GM
module LS = Gbl.LS


(* Global dependencies may discover an influence after its local RHS has
already been checked. Keep all scheduled locals in the set so such late
discoveries do not evaluate the same final RHS again. *)
let work = ref (([] : System.LVar.t list), LS.empty)

let add_work x = let (l,s) = !work in
Expand All @@ -373,11 +375,11 @@ module Checker (System: FwdGlobConstrSys)
match l with
| [] -> None
| x::xs ->
let s = LS.remove x s in
let _ = work := (xs,s) in
Some x

let check localinit globalinit xs =
work := ([], LS.empty);

let sigma_out = LM.create 100 in
let tau_out = GM.create 100 in
Expand Down
20 changes: 0 additions & 20 deletions tests/regression/55-loop-unrolling/11-unrolled-loop-invariant.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,26 +198,6 @@
live: 10
dead: 0
total lines: 10
[Warning][Deadcode][CWE-570] condition 'k < 100' (possibly inserted by CIL) is always false (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'j < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:8:10-8:16)
[Warning][Deadcode][CWE-570] condition 'k < 100' (possibly inserted by CIL) is always false (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-570] condition 'k < 100' (possibly inserted by CIL) is always false (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'j < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:8:10-8:16)
[Warning][Deadcode][CWE-570] condition 'k < 100' (possibly inserted by CIL) is always false (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'i < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:4:10-4:16)
[Warning][Deadcode][CWE-571] condition 'i < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:4:10-4:16)
[Warning][Deadcode][CWE-571] condition 'i < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:4:10-4:16)
[Warning][Deadcode][CWE-571] condition 'i < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:4:10-4:16)
[Warning][Deadcode][CWE-571] condition 'i < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:4:10-4:16)
[Warning][Deadcode][CWE-571] condition 'j < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:8:10-8:16)
[Warning][Deadcode][CWE-570] condition 'k < 100' (possibly inserted by CIL) is always false (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'j < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:8:10-8:16)
[Warning][Deadcode][CWE-571] condition 'k < 100' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'k < 100' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'k < 100' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'k < 100' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'k < 100' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:9:12-9:19)
[Warning][Deadcode][CWE-571] condition 'j < 10' (possibly inserted by CIL) is always true (11-unrolled-loop-invariant.c:8:10-8:16)
[Info][Witness] witness generation summary:
location invariants: 11
loop invariants: 5
Expand Down
6 changes: 3 additions & 3 deletions tests/regression/70-transform/02-deadcode.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@
basic1(7);
basic1(3);
basic1(6);
basic2(-3);
basic2(-6);
basic2(-12);
basic2(- 3);
basic2(- 6);
basic2(- 12);
one_branch_dead(9);
one_branch_dead(12);
f = & uncalled_but_referenced_function;
Expand Down
2 changes: 1 addition & 1 deletion tests/regression/70-transform/04-unchecked-condition.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
f_both(3);
f_both(9);
f_true(12);
f_false(-3);
f_false(- 3);
}
return (0);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/sv-comp/basic/if_det_incr_true-unreach-call.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
│ _ │ │
└─────────────────────┘ │
│ │
│ Assign 'x = -1' │ Test (x,false)
│ Assign 'x = - 1' │ Test (x,false)
▼ │
┌─────────────────────┐ │
│ _ │ │
Expand Down
Loading