Skip to content

Zero alloc remove annotation from stdlib #1434

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Jun 8, 2023
Merged

Zero alloc remove annotation from stdlib #1434

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
f6ed887
Remove [@@@zero_alloc check] annotations from stdlib
gretay-js May 25, 2023
d0209c2
Remove -zero-alloc-check flag from compiler's dune
gretay-js May 25, 2023
bb9b971
Fix line numbers in tests
gretay-js May 31, 2023
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
7 changes: 1 addition & 6 deletions ocaml/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))))
Expand Down
1 change: 0 additions & 1 deletion ocaml/stdlib/camlinternalAtomic.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
(**************************************************************************)

[@@@ocaml.flambda_o3]
[@@@ocaml.zero_alloc check]

(* CamlinternalAtomic is a dependency of Stdlib, so it is compiled with
-nopervasives. *)
Expand Down
1 change: 0 additions & 1 deletion ocaml/stdlib/camlinternalFormatBasics.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
(* special exception on linking described in the file LICENSE. *)
(* *)
(**************************************************************************)
[@@@ocaml.zero_alloc check]

(* Padding position. *)
type padty =
Expand Down
1 change: 0 additions & 1 deletion ocaml/stdlib/std_exit.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 *)

Expand Down
1 change: 0 additions & 1 deletion ocaml/stdlib/stdlib.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

[@@@ocaml.warning "-49"]
[@@@ocaml.flambda_o3]
[@@@ocaml.zero_alloc check]

(* Exceptions *)

Expand Down
2 changes: 1 addition & 1 deletion ocaml/testsuite/tests/backtrace/pr2195-locs.byte.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ocaml/testsuite/tests/backtrace/pr2195.opt.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ocaml/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down