Skip to content

Fix compilation on OCaml 5.0.0~rc1 #945

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

Merged
merged 3 commits into from
Dec 14, 2022
Merged

Fix compilation on OCaml 5.0.0~rc1 #945

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
4a9c7d4
Fix FileDomain compilation on OCaml 5.0.0~rc1
sim642 Dec 12, 2022
4577d47
Fix compilation with catapult 0.2
sim642 Dec 12, 2022
9321d11
Add OCaml 5.0.0~rc1 to unlocked CI
sim642 Dec 12, 2022
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
3 changes: 3 additions & 0 deletions .github/workflows/unlocked.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
- os: ubuntu-latest
ocaml-compiler: 4.14.x
z3: true
- os: ubuntu-latest
ocaml-compiler: ocaml-base-compiler.5.0.0~rc1
apron: false

# customize name to use readable string for apron instead of just a boolean
# workaround for missing ternary operator: https://github.com/actions/runner/issues/409
Expand Down
2 changes: 1 addition & 1 deletion src/cdomains/fileDomain.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ struct

let fopen k loc filename mode m =
if is_unknown k m then m else
let mode = match String.lowercase mode with "r" -> Val.Read | _ -> Val.Write in
let mode = match String.lowercase_ascii mode with "r" -> Val.Read | _ -> Val.Write in
let v = V.make k loc (Val.Open(filename, mode)) in
add' k v m
let fclose k loc m =
Expand Down
4 changes: 2 additions & 2 deletions src/util/processPool.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ let run ~jobs ?(terminated=fun _ _ -> ()) tasks =
Unix.open_process task.command
in
let pid = Unix.process_pid proc in
Catapult.Tracing.a_begin ~id:(string_of_int pid) "ProcessPool" ~args:[("command", `String task.command)];
Catapult.Tracing.a_begin ~id:(string_of_int pid) ~cat:[] "ProcessPool" ~args:[("command", `String task.command)];
Hashtbl.replace procs pid (task, proc);
run tasks
| [] when Hashtbl.length procs = 0 ->
Expand All @@ -36,7 +36,7 @@ let run ~jobs ?(terminated=fun _ _ -> ()) tasks =
close_in proc_in;
close_out proc_out;
Hashtbl.remove procs pid;
Catapult.Tracing.a_exit ~id:(string_of_int pid) "ProcessPool";
Catapult.Tracing.a_exit ~id:(string_of_int pid) ~cat:[] "ProcessPool";
terminated task status
| None -> (* unrelated process *)
()
Expand Down