Skip to content

Commit 959f36a

Browse files
committed
CHC: add index to output parameters
1 parent d36ab8d commit 959f36a

3 files changed

Lines changed: 44 additions & 40 deletions

File tree

‎CodeHawk/CHC/cchlib/cCHVersion.ml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ object (self)
6262
end
6363

6464
let version = new version_info_t
65-
~version:"0.3.0_20251127"
66-
~date:"2025-11-27"
65+
~version:"0.3.0_20260130"
66+
~date:"2026-01-30"

‎CodeHawk/CHC/cchpre/cCHCreateOutputParameterPOs.ml‎

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
open CHPretty
3030

3131
(* chutil *)
32+
open CHLogger
3233
open CHTimingLog
3334
open CHTraceResult
3435

@@ -215,12 +216,14 @@ object (self)
215216
(e: exp)
216217
(el: exp list)
217218
(loc: location) =
219+
let vname =
220+
match e with
221+
| Lval (Var (vname, _), _) -> vname
222+
| _ -> "?" in
223+
let _ =
224+
ch_info_log#add "create_po_call" (STR vname) in
218225
let is_ref_arg (arg: exp) =
219226
is_pointer_type (fenv#get_type_unrolled (type_of_exp self#env arg)) in
220-
let is_library_call =
221-
match e with
222-
| Lval (Var (vname, _), _) -> fenv#has_external_header vname
223-
| _ -> false in
224227
begin
225228
(match lval_o with
226229
| Some lval -> self#create_po_lval context#add_lhs lval loc
@@ -238,8 +241,9 @@ object (self)
238241
begin
239242
self#create_output_parameter_po_s context loc;
240243
self#analysisdigest#add_call_dependency loc context e;
241-
(if not is_library_call then
242-
self#analysisdigest#add_callee_callsite loc context e);
244+
self#analysisdigest#add_callee_callsite loc context e;
245+
ch_info_log#add "add_callee_callsite"
246+
(LBLOCK [STR "context: "; STR context#to_string])
243247
end);
244248
(List.iteri (fun i x ->
245249
let newcontext = context#add_arg (i + 1) in
@@ -249,18 +253,20 @@ object (self)
249253
| TPtr _ ->
250254
begin
251255
self#add_ppo (PValidMem x) loc newcontext;
252-
(if not is_library_call then
253-
begin
254-
self#add_ppo (POutputParameterArgument x) loc newcontext;
255-
(List.iter (fun vinfo ->
256-
self#add_ppo
257-
(POutputParameterNoEscape (vinfo, x)) loc newcontext)
258-
self#active_params);
259-
self#analysisdigest#add_callee_callsite_arg
260-
loc context newcontext x;
261-
self#analysisdigest#add_call_dependency_arg
262-
loc context newcontext x
263-
end)
256+
begin
257+
self#add_ppo (POutputParameterArgument x) loc newcontext;
258+
(List.iter (fun vinfo ->
259+
self#add_ppo
260+
(POutputParameterNoEscape (vinfo, x)) loc newcontext)
261+
self#active_params);
262+
self#analysisdigest#add_callee_callsite_arg
263+
loc context newcontext x;
264+
self#analysisdigest#add_call_dependency_arg
265+
loc context newcontext x;
266+
ch_info_log#add
267+
"add_callee_callsite_arg"
268+
(LBLOCK [STR vname; STR ": "; INT i])
269+
end
264270
end
265271
| _ -> ())
266272
end) el)
@@ -414,13 +420,14 @@ object (self)
414420
end
415421

416422

417-
let get_pointer_parameters (fundec: fundec): varinfo list =
423+
let get_pointer_parameters (fundec: fundec): (int * varinfo) list =
418424
let fdecls = fundec.sdecls in
419425
match fundec.svar.vtype with
420426
| TFun (_, Some funargs, _, _) | TPtr (TFun (_, Some funargs, _, _), _) ->
421-
List.fold_left (fun acc (vname, ty, _) ->
427+
let funargs = List.mapi (fun i a -> (i, a)) funargs in
428+
List.fold_left (fun acc (i, (vname, ty, _)) ->
422429
match ty with
423-
| TPtr _ -> (fdecls#get_varinfo_by_name vname) :: acc
430+
| TPtr _ -> (i + 1, fdecls#get_varinfo_by_name vname) :: acc
424431
| _ -> acc) [] funargs
425432
| _ -> []
426433

@@ -429,12 +436,12 @@ let get_pointer_parameters (fundec: fundec): varinfo list =
429436
the conditions posed on output parameters based on their types.*)
430437
let initialize_output_parameters
431438
(analysisdigest: output_parameter_analysis_digest_int)
432-
(ptrparams: varinfo list): unit traceresult =
433-
List.fold_left (fun acc ptrparam ->
439+
(ptrparams: (int * varinfo) list): unit traceresult =
440+
List.fold_left (fun acc (paramindex, ptrparam) ->
434441
match acc with
435442
| Error _ -> acc
436443
| _ ->
437-
let* _ = analysisdigest#add_new_parameter ptrparam in
444+
let* _ = analysisdigest#add_new_parameter paramindex ptrparam in
438445
let pname = ptrparam.vname in
439446
let ptype = fenv#get_type_unrolled ptrparam.vtype in
440447
if has_const_attribute ptype then
@@ -478,19 +485,16 @@ let process_function (fname:string): unit traceresult =
478485
let _ = log_info "Process function %s [%s:%d]" fname __FILE__ __LINE__ in
479486
let fundec = read_function_semantics fname in
480487
let ptrparams = get_pointer_parameters fundec in
481-
(* if (List.length ptrparams) > 0 then *)
482-
let _ = read_proof_files fname fundec.sdecls in
483-
let* _ = proof_scaffolding#initialize_output_parameter_analysis fname in
484-
let* analysisdigest = proof_scaffolding#get_output_parameter_analysis fname in
485-
let* _ = initialize_output_parameters analysisdigest ptrparams in
486-
let _ = (new po_creator_t fundec analysisdigest)#create_proof_obligations in
487-
let _ = CCHCheckValid.process_function fname in
488-
let _ = save_analysis_digests fname in
489-
let _ = save_proof_files fname in
490-
let _ = save_api fname in
491-
Ok ()
492-
(* else
493-
Ok () *)
488+
let _ = read_proof_files fname fundec.sdecls in
489+
let* _ = proof_scaffolding#initialize_output_parameter_analysis fname in
490+
let* analysisdigest = proof_scaffolding#get_output_parameter_analysis fname in
491+
let* _ = initialize_output_parameters analysisdigest ptrparams in
492+
let _ = (new po_creator_t fundec analysisdigest)#create_proof_obligations in
493+
let _ = CCHCheckValid.process_function fname in
494+
let _ = save_analysis_digests fname in
495+
let _ = save_proof_files fname in
496+
let _ = save_api fname in
497+
Ok ()
494498

495499

496500
let output_parameter_po_process_file (): unit traceresult =

‎CodeHawk/CHC/cchpre/cCHPreTypes.mli‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@ class type output_parameter_analysis_digest_int =
15611561

15621562
method is_active: proof_obligation_int list -> bool
15631563

1564-
method add_new_parameter: varinfo -> unit traceresult
1564+
method add_new_parameter: int -> varinfo -> unit traceresult
15651565

15661566
method add_parameter: candidate_output_parameter_int -> unit traceresult
15671567

0 commit comments

Comments
 (0)