From 4a9c7d418e3ffe8b5fbe77bf1be80d680bd46a2b Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Mon, 12 Dec 2022 17:57:17 +0200 Subject: [PATCH 1/3] Fix FileDomain compilation on OCaml 5.0.0~rc1 --- src/cdomains/fileDomain.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cdomains/fileDomain.ml b/src/cdomains/fileDomain.ml index 9510033266..d9d21f9822 100644 --- a/src/cdomains/fileDomain.ml +++ b/src/cdomains/fileDomain.ml @@ -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 = From 4577d4774361443b063ef6f975cd609b9dc95f93 Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Mon, 12 Dec 2022 18:05:21 +0200 Subject: [PATCH 2/3] Fix compilation with catapult 0.2 --- src/util/processPool.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/processPool.ml b/src/util/processPool.ml index 59eb978ce9..e93aa10548 100644 --- a/src/util/processPool.ml +++ b/src/util/processPool.ml @@ -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 -> @@ -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 *) () From 9321d1101fba5d37ae36b0011d6287d7ad1f035f Mon Sep 17 00:00:00 2001 From: Simmo Saan Date: Mon, 12 Dec 2022 18:07:24 +0200 Subject: [PATCH 3/3] Add OCaml 5.0.0~rc1 to unlocked CI --- .github/workflows/unlocked.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/unlocked.yml b/.github/workflows/unlocked.yml index 445e7e04d2..1de57adbe0 100644 --- a/.github/workflows/unlocked.yml +++ b/.github/workflows/unlocked.yml @@ -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