From f6ed8873a1f0fd56fad3b2de82f73ad85223adfb Mon Sep 17 00:00:00 2001 From: Greta Yorsh Date: Thu, 25 May 2023 14:18:44 +0100 Subject: [PATCH 1/3] Remove [@@@zero_alloc check] annotations from stdlib --- ocaml/stdlib/camlinternalAtomic.ml | 1 - ocaml/stdlib/camlinternalFormatBasics.ml | 1 - ocaml/stdlib/std_exit.ml | 1 - ocaml/stdlib/stdlib.ml | 1 - 4 files changed, 4 deletions(-) diff --git a/ocaml/stdlib/camlinternalAtomic.ml b/ocaml/stdlib/camlinternalAtomic.ml index 8f85b6df073..a6425580548 100644 --- a/ocaml/stdlib/camlinternalAtomic.ml +++ b/ocaml/stdlib/camlinternalAtomic.ml @@ -14,7 +14,6 @@ (**************************************************************************) [@@@ocaml.flambda_o3] -[@@@ocaml.zero_alloc check] (* CamlinternalAtomic is a dependency of Stdlib, so it is compiled with -nopervasives. *) diff --git a/ocaml/stdlib/camlinternalFormatBasics.ml b/ocaml/stdlib/camlinternalFormatBasics.ml index 4195d931fd3..d14a5d90e27 100644 --- a/ocaml/stdlib/camlinternalFormatBasics.ml +++ b/ocaml/stdlib/camlinternalFormatBasics.ml @@ -13,7 +13,6 @@ (* special exception on linking described in the file LICENSE. *) (* *) (**************************************************************************) -[@@@ocaml.zero_alloc check] (* Padding position. *) type padty = diff --git a/ocaml/stdlib/std_exit.ml b/ocaml/stdlib/std_exit.ml index f1fd496275a..1700b44d9b6 100644 --- a/ocaml/stdlib/std_exit.ml +++ b/ocaml/stdlib/std_exit.ml @@ -17,7 +17,6 @@ open! Stdlib [@@@ocaml.flambda_o3] -[@@@ocaml.zero_alloc check] (* Ensure that [at_exit] functions are called at the end of every program *) diff --git a/ocaml/stdlib/stdlib.ml b/ocaml/stdlib/stdlib.ml index ca3f124ce01..aab00bf3da7 100644 --- a/ocaml/stdlib/stdlib.ml +++ b/ocaml/stdlib/stdlib.ml @@ -16,7 +16,6 @@ [@@@ocaml.warning "-49"] [@@@ocaml.flambda_o3] -[@@@ocaml.zero_alloc check] (* Exceptions *) From d0209c2587fbf985d77c00a542459c2e14c23b57 Mon Sep 17 00:00:00 2001 From: Greta Yorsh Date: Thu, 25 May 2023 14:19:22 +0100 Subject: [PATCH 2/3] Remove -zero-alloc-check flag from compiler's dune --- ocaml/dune | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ocaml/dune b/ocaml/dune index 41a85a0a024..2bc207bf353 100644 --- a/ocaml/dune +++ b/ocaml/dune @@ -20,12 +20,7 @@ (main (flags - (:standard -warn-error +A)) - (ocamlopt_flags - ;; CR gyorsh: it is not clear what the ":standard" flags are, and they - ;; may change depending on the version of dune. - ;; Consider hard-coded flags, such as -O3. - (:standard -zero-alloc-check))) + (:standard -warn-error +A))) (boot (flags (:standard -warn-error +A)))) From bb9b9714a266c4cd16dc71f4c57d328e7097cf53 Mon Sep 17 00:00:00 2001 From: Greta Yorsh Date: Wed, 31 May 2023 17:04:30 +0100 Subject: [PATCH 3/3] Fix line numbers in tests --- ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference | 2 +- ocaml/testsuite/tests/backtrace/pr2195.opt.reference | 4 ++-- .../tests/lib-dynlink-initializers/test10_main.byte.reference | 2 +- .../lib-dynlink-initializers/test10_main.native.reference | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference b/ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference index 2b61bb9e290..fb561f348f7 100644 --- a/ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference +++ b/ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference @@ -1,4 +1,4 @@ Fatal error: exception Stdlib.Exit -Raised at Stdlib.open_in_gen in file "stdlib.ml", line 409, characters 28-54 +Raised at Stdlib.open_in_gen in file "stdlib.ml", line 408, characters 28-54 Called from Pr2195 in file "pr2195.ml", line 24, characters 6-19 Re-raised at Pr2195 in file "pr2195.ml", line 29, characters 4-41 diff --git a/ocaml/testsuite/tests/backtrace/pr2195.opt.reference b/ocaml/testsuite/tests/backtrace/pr2195.opt.reference index afa205ede6d..c759534f84c 100644 --- a/ocaml/testsuite/tests/backtrace/pr2195.opt.reference +++ b/ocaml/testsuite/tests/backtrace/pr2195.opt.reference @@ -1,5 +1,5 @@ Fatal error: exception Stdlib.Exit -Raised at Stdlib.open_in_gen in file "stdlib.ml", line 409, characters 28-54 -Called from Stdlib.open_in in file "stdlib.ml", line 414, characters 2-45 +Raised at Stdlib.open_in_gen in file "stdlib.ml", line 408, characters 28-54 +Called from Stdlib.open_in in file "stdlib.ml", line 413, characters 2-45 Called from Pr2195 in file "pr2195.ml", line 24, characters 6-19 Re-raised at Pr2195 in file "pr2195.ml", line 29, characters 4-41 diff --git a/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference b/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference index 8acee7ab284..f8b2d961439 100755 --- a/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference +++ b/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference @@ -1,5 +1,5 @@ Error: Failure("Plugin error") -Raised at Stdlib.failwith in file "stdlib.ml", line 33, characters 17-33 +Raised at Stdlib.failwith in file "stdlib.ml", line 32, characters 17-33 Called from Test10_plugin.g in file "test10_plugin.ml", line 3, characters 2-21 Called from Test10_plugin.f in file "test10_plugin.ml", line 6, characters 2-6 Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6 diff --git a/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference b/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference index 32559753dd5..4d03df31994 100755 --- a/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference +++ b/ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference @@ -1,5 +1,5 @@ Error: Failure("Plugin error") -Raised at Stdlib.failwith in file "stdlib.ml", line 33, characters 17-33 +Raised at Stdlib.failwith in file "stdlib.ml", line 32, characters 17-33 Called from Test10_plugin.g in file "test10_plugin.ml" (inlined), line 2, characters 15-38 Called from Test10_plugin.f in file "test10_plugin.ml", line 6, characters 2-6 Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6