@ -115,6 +115,8 @@ struct
type analysis_data = T . analysis_data
type analysis_data = T . analysis_data
let ( ` UnderApproximateAfter disjunct_limit ) = DConfig . join_policy
module Domain = struct
module Domain = struct
(* * a list [\[x1; x2; ...; xN\]] represents a disjunction [x1 ∨ ∨ ∨ *)
(* * a list [\[x1; x2; ...; xN\]] represents a disjunction [x1 ∨ ∨ ∨ *)
type t = T . Domain . t list
type t = T . Domain . t list
@ -128,38 +130,42 @@ struct
aux 0 n l
aux 0 n l
let append_no_duplicates_up_to leq n from ~ into =
let append_no_duplicates_up_to leq ~ limit from ~ into ~ into_length =
let rec aux n acc from =
let rec aux acc n_ acc from =
match from with
match from with
| hd :: tl when n > 0 ->
| hd :: tl when n _acc < limit ->
(* check with respect to the original [into] and not [acc] as we assume lists of
(* check with respect to the original [into] and not [acc] as we assume lists of
disjuncts are already deduplicated * )
disjuncts are already deduplicated * )
if List . exists into ~ f : ( fun into_disj -> leq ~ lhs : hd ~ rhs : into_disj ) then
if List . exists into ~ f : ( fun into_disj -> leq ~ lhs : hd ~ rhs : into_disj ) then
(* [hd] is already implied by one of the states in [into]; skip it
(* [hd] is already implied by one of the states in [into]; skip it
( [ ( a = > b ) = > ( a \ / b < = > b ) ] ) * )
( [ ( a = > b ) = > ( a \ / b < = > b ) ] ) * )
aux n acc tl
aux acc n_ acc tl
else aux ( n - 1 ) ( hd :: acc ) tl
else aux ( hd :: acc ) ( n_acc + 1 ) tl
| _ ->
| _ ->
(* [from] is empty or [n = 0], either way we are done *) acc
(* [from] is empty or [n _acc ≥ limit], either way we are done *) ( acc , n_acc )
in
in
aux into from
aux i nto into _length from
(* * Ignore states in [lhs] that are over-approximated in [rhs] and vice-versa. Favors keeping
(* * Ignore states in [lhs] that are over-approximated in [rhs] according to [leq] and
states in [ lhs ] . * )
vice - versa . Favors keeping states in [ lhs ] . Returns no more than [ limit ] disjuncts . * )
let join_up_to leq lhs rhs =
let join_up_to_with_leq ~ limit leq ~ into : lhs rhs =
if phys_equal lhs rhs then lhs
match length_if_leq limit lhs with
else
let ( ` UnderApproximateAfter n ) = DConfig . join_policy in
match length_if_leq n lhs with
| None ->
| None ->
(* already at max disjuncts *) lhs
(* we are past [limit] with just [lhs], trim back down *)
( List . take lhs limit , limit )
| Some lhs_length ->
| Some lhs_length ->
if phys_equal lhs rhs then ( lhs , lhs_length )
else
(* this filters only in one direction for now, could be worth doing both ways *)
(* this filters only in one direction for now, could be worth doing both ways *)
append_no_duplicates_up_to leq ( n - lhs_length ) rhs ~ into : lhs
append_no_duplicates_up_to leq ~ limit rhs ~ into : lhs ~ into_length : lhs_length
let join_up_to ~ limit ~ into : lhs rhs =
join_up_to_with_leq ~ limit ( fun ~ lhs ~ rhs -> phys_equal lhs rhs ) ~ into : lhs rhs
let join lhs rhs = join_up_to ( fun ~ lhs ~ rhs -> phys_equal lhs rhs ) lhs rhs
let join lhs rhs = join_up_to ~limit : disjunct_limit ~ into : lhs rhs | > fst
(* * check if elements of [disj] appear in [of_] in the same order, using pointer equality on
(* * check if elements of [disj] appear in [of_] in the same order, using pointer equality on
abstract states to compare elements quickly * )
abstract states to compare elements quickly * )
@ -184,7 +190,7 @@ struct
L . d_printfln " Iteration %d is greater than max iter %d, stopping. " num_iters max_iter ;
L . d_printfln " Iteration %d is greater than max iter %d, stopping. " num_iters max_iter ;
prev )
prev )
else
else
let post = join_up_to T . Domain . leq prev next in
let post , _ = join_up_to _with_leq ~ limit : disjunct_limit T . Domain . leq ~ into : prev next in
if leq ~ lhs : post ~ rhs : prev then prev else post
if leq ~ lhs : post ~ rhs : prev then prev else post
@ -196,22 +202,25 @@ struct
F . fprintf f " @[<v>%d disjuncts:@;%a@] " ( List . length disjuncts ) pp_disjuncts disjuncts
F . fprintf f " @[<v>%d disjuncts:@;%a@] " ( List . length disjuncts ) pp_disjuncts disjuncts
end
end
(* * the number of remaining disjuncts taking into account disjuncts already recorded in the post
of a node ( and therefore that will stay there ) * )
let remaining_disjuncts = ref None
let exec_instr pre_disjuncts analysis_data node _ instr =
let exec_instr pre_disjuncts analysis_data node _ instr =
List . foldi pre_disjuncts ~ init : [] ~ f : ( fun i post_disjuncts pre_disjunct ->
(* always called from [exec_node_instrs] so [remaining_disjuncts] should always be [Some _] *)
let should_skip =
let limit = Option . value_exn ! remaining_disjuncts in
let ( ` UnderApproximateAfter n ) = DConfig . join_policy in
List . foldi pre_disjuncts ~ init : ( [] , 0 ) ~ f : ( fun i ( post_disjuncts , n_disjuncts ) pre_disjunct ->
List . length post_disjuncts > = n
if n_disjuncts > = limit then (
in
if should_skip then (
L . d_printfln " @[<v2>Reached max disjuncts limit, skipping disjunct #%d@;@] " i ;
L . d_printfln " @[<v2>Reached max disjuncts limit, skipping disjunct #%d@;@] " i ;
post_disjuncts )
( post_disjuncts , n_disjuncts ) )
else (
else (
L . d_printfln " @[<v2>Executing instruction from disjunct #%d@; " i ;
L . d_printfln " @[<v2>Executing instruction from disjunct #%d@; " i ;
let disjuncts' = T . exec_instr pre_disjunct analysis_data node instr in
let disjuncts' = T . exec_instr pre_disjunct analysis_data node instr in
( if Config . write_html then
( if Config . write_html then
let n = List . length disjuncts' in
let n = List . length disjuncts' in
L . d_printfln " @]@ \n @[Got %d disjunct%s back@] " n ( if Int . equal n 1 then " " else " s " ) ) ;
L . d_printfln " @]@ \n @[Got %d disjunct%s back@] " n ( if Int . equal n 1 then " " else " s " ) ) ;
Domain . join post_disjuncts disjuncts' ) )
Domain . join_up_to ~ limit ~ into : post_disjuncts disjuncts' ) )
| > fst
let exec_node_instrs old_state_opt ~ exec_instr pre instrs =
let exec_node_instrs old_state_opt ~ exec_instr pre instrs =
@ -222,16 +231,24 @@ struct
| Some { State . pre = previous_pre ; _ } ->
| Some { State . pre = previous_pre ; _ } ->
not ( List . mem ~ equal : phys_equal previous_pre disjunct )
not ( List . mem ~ equal : phys_equal previous_pre disjunct )
in
in
let current_post = match old_state_opt with None -> [] | Some { State . post ; _ } -> post in
let current_post_n =
List . foldi pre ~ init : current_post ~ f : ( fun i post_disjuncts pre_disjunct ->
match old_state_opt with None -> ( [] , 0 ) | Some { State . post ; _ } -> ( post , List . length post )
if is_new_pre pre_disjunct then (
in
L . d_printfln " @[<v2>Executing node from disjunct #%d@; " i ;
List . foldi pre ~ init : current_post_n ~ f : ( fun i ( post_disjuncts , n_disjuncts ) pre_disjunct ->
let limit = disjunct_limit - n_disjuncts in
remaining_disjuncts := Some limit ;
if limit < = 0 then (
L . d_printfln " @[Reached disjunct limit: already got %d disjuncts@]@; " limit ;
( post_disjuncts , n_disjuncts ) )
else if is_new_pre pre_disjunct then (
L . d_printfln " @[<v2>Executing node from disjunct #%d, setting limit to %d@; " i limit ;
let disjuncts' = Instrs . foldi ~ init : [ pre_disjunct ] instrs ~ f : exec_instr in
let disjuncts' = Instrs . foldi ~ init : [ pre_disjunct ] instrs ~ f : exec_instr in
L . d_printfln " @]@ \n " ;
L . d_printfln " @]@ \n " ;
Domain . join post_disjuncts disjuncts' )
Domain . join _up_to ~ limit : disjunct_limit ~ into : post_disjuncts disjuncts' )
else (
else (
L . d_printfln " @[Skipping already-visited disjunct #%d@]@; " i ;
L . d_printfln " @[Skipping already-visited disjunct #%d@]@; " i ;
post_disjuncts ) )
( post_disjuncts , n_disjuncts ) ) )
| > fst
let pp_session_name node f = T . pp_session_name node f
let pp_session_name node f = T . pp_session_name node f
@ -339,7 +356,7 @@ module AbstractInterpreterCommon (TransferFunctions : NodeTransferFunctions) = s
logged_error := true ) ) ;
logged_error := true ) ) ;
Caml . Printexc . raise_with_backtrace exn backtrace
Caml . Printexc . raise_with_backtrace exn backtrace
in
in
(* hack to ensure that we call `exec_instr` on a node even if it has no instructions *)
(* hack to ensure that we call [exec_instr] on a node even if it has no instructions *)
let instrs = if Instrs . is_empty instrs then Instrs . singleton Sil . skip_instr else instrs in
let instrs = if Instrs . is_empty instrs then Instrs . singleton Sil . skip_instr else instrs in
TransferFunctions . exec_node_instrs old_state_opt ~ exec_instr pre instrs
TransferFunctions . exec_node_instrs old_state_opt ~ exec_instr pre instrs
Jules Villard
3 years ago
committed by
Facebook GitHub Bot