Skip to content

Add __loop_condition labels before syntactic loop conditions #197

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add __loop_condition labels before syntactic loop conditions #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8704ff9
Add __loop_condition labels before syntactic loop conditions
sim642 Oct 23, 2025
2e07612
Add option Cabs2cil.addLoopConditionLabels
sim642 Oct 24, 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
16 changes: 12 additions & 4 deletions src/frontc/cabs2cil.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ let alwaysGenerateVarDecl = false
*)
let addNestedScopeAttr = ref false

let addLoopConditionLabels = ref false

(** Indicates whether we're allowed to duplicate small chunks. *)
let allowDuplication: bool ref = ref true

Expand Down Expand Up @@ -1257,6 +1259,12 @@ let consLabContinue (c: chunk) =
| While :: rest -> c
| NotWhile lr :: rest -> if !lr = "" then c else consLabel !lr c !currentLoc false

let consLabLoopCondition (c: chunk) =
if !addLoopConditionLabels then
consLabel (newLabelName "__loop_condition") c !currentLoc false
else
c

let break_env = Stack.create ()

let enter_break_env () = Stack.push () break_env
Expand Down Expand Up @@ -6792,7 +6800,7 @@ and doStatement (s : A.statement) : chunk =
exitLoop ();
currentLoc := SynthetizeLoc.doLoc loc';
currentExpLoc := SynthetizeLoc.doLoc eloc';
loopChunk ((doCondition false e skipChunk break_cond)
loopChunk (consLabLoopCondition (doCondition false e skipChunk break_cond)
@@ s')

| A.DOWHILE(e,s,loc,eloc) ->
Expand All @@ -6803,7 +6811,7 @@ and doStatement (s : A.statement) : chunk =
currentLoc := SynthetizeLoc.doLoc loc';
currentExpLoc := SynthetizeLoc.doLoc eloc';
let s'' =
consLabContinue (doCondition false e skipChunk (breakChunk loc')) (* TODO: use eloc'? *)
consLabContinue (consLabLoopCondition (doCondition false e skipChunk (breakChunk loc'))) (* TODO: use eloc'? *)
in
exitLoop ();
loopChunk (s' @@ s'')
Expand Down Expand Up @@ -6837,9 +6845,9 @@ and doStatement (s : A.statement) : chunk =
let res =
match e2 with
A.NOTHING -> (* This means true *)
se1 @@ loopChunk (s' @@ s'')
se1 @@ loopChunk (consLabLoopCondition s' @@ s'')
| _ ->
se1 @@ loopChunk ((doCondition false e2 skipChunk break_cond)
se1 @@ loopChunk (consLabLoopCondition (doCondition false e2 skipChunk break_cond)
@@ s' @@ s'')
in
exitScope ();
Expand Down
3 changes: 3 additions & 0 deletions src/frontc/cabs2cil.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ val nocil: int ref
*)
val addNestedScopeAttr: bool ref

(** Add [__loop_condition] labels before syntactic loop conditions. *)
val addLoopConditionLabels: bool ref

(** Indicates whether we're allowed to duplicate small chunks of code. *)
val allowDuplication: bool ref

Expand Down