Skip to content

Remove __annonCompField offsets from witness invariants #1874

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: master
Choose a base branch
from
Draft

Remove __annonCompField offsets from witness invariants #1874

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
1 change: 1 addition & 0 deletions src/cdomain/value/domains/invariant.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ struct
inv
|> exp_deep_unroll_types
|> InvariantCil.exp_replace_original_name
|> InvariantCil.exp_remove_anon_comp_offset
in
if GobConfig.get_bool "witness.invariant.split-conjunction" then
ES.elements (pullOutCommonConjuncts inv')
Expand Down
26 changes: 26 additions & 0 deletions src/cdomain/value/domains/invariantCil.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,32 @@ let exp_replace_original_name =
let visitor = new exp_replace_original_name_visitor in
visitCilExpr visitor

let fieldinfo_is_anon (fi: fieldinfo) =
String.starts_with ~prefix:"__annonCompField" fi.fname (* TODO: what if CIL-ed program explicitly has this? *)

let rec offset_remove_anon_comp_offset = function
| NoOffset -> NoOffset
| Index (e, offs') -> Index (e, offset_remove_anon_comp_offset offs')
| Field (fi, offs') ->
let offs'' = offset_remove_anon_comp_offset offs' in
if fieldinfo_is_anon fi then (
match offs'' with
| Field _ -> offs''
| NoOffset
| Index _ -> failwith "offset_remove_anon_comp_offset: anon comp field not followed by field"
)
else
Field (fi, offs'')

class exp_remove_anon_comp_offset_visitor = object
inherit nopCilVisitor
method! voffs (offs: offset) =
ChangeTo (offset_remove_anon_comp_offset offs)
end
let exp_remove_anon_comp_offset =
let visitor = new exp_remove_anon_comp_offset_visitor in
visitCilExpr visitor

class exp_deep_unroll_types_visitor = object
inherit nopCilVisitor
method! vtype (t: typ) =
Expand Down
Loading