diff --git a/stdlib/Makefile b/stdlib/Makefile index fe18bb18413..081f7be3cf7 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -24,9 +24,6 @@ CAMLC=$(CAMLRUN) $(COMPILER) COMPFLAGS=-strict-sequence -absname -w +a-4-9-41-42-44-45-48-66 \ -g -warn-error A -bin-annot -nostdlib -principal \ -safe-string -strict-formats -nopervasives -no-alias-deps -ifeq "$(FLAMBDA)" "true" -OPTCOMPFLAGS += -O3 -endif OPTCOMPILER=$(ROOTDIR)/ocamlopt$(EXE) CAMLOPT=$(CAMLRUN) $(OPTCOMPILER) CAMLDEP=$(BOOT_OCAMLC) -depend diff --git a/stdlib/arg.ml b/stdlib/arg.ml index a72660aa619..0a43f63160c 100644 --- a/stdlib/arg.ml +++ b/stdlib/arg.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type key = string type doc = string type usage_msg = string diff --git a/stdlib/array.ml b/stdlib/array.ml index 384c5c57b80..8e329cdc68c 100644 --- a/stdlib/array.ml +++ b/stdlib/array.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* An alias for the type of arrays. *) type 'a t = 'a array diff --git a/stdlib/arrayLabels.ml b/stdlib/arrayLabels.ml index 58a2411f1bf..c50c7a95ab3 100644 --- a/stdlib/arrayLabels.ml +++ b/stdlib/arrayLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [ArrayLabels]: labelled Array module *) [@@@ocaml.nolabels] diff --git a/stdlib/bigarray.ml b/stdlib/bigarray.ml index 63fa101b584..b793b072b23 100644 --- a/stdlib/bigarray.ml +++ b/stdlib/bigarray.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Bigarray]: large, multi-dimensional, numerical arrays *) (* These types in must be kept in sync with the tables in diff --git a/stdlib/bool.ml b/stdlib/bool.ml index 9a838b619af..a311651e73f 100644 --- a/stdlib/bool.ml +++ b/stdlib/bool.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type t = bool = false | true external not : bool -> bool = "%boolnot" diff --git a/stdlib/buffer.ml b/stdlib/buffer.ml index 96c651bbcad..3ffcf6a4e48 100644 --- a/stdlib/buffer.ml +++ b/stdlib/buffer.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Extensible buffers *) [@@@ocaml.inline 3] diff --git a/stdlib/bytes.ml b/stdlib/bytes.ml index 4982c111452..543b9549f1c 100644 --- a/stdlib/bytes.ml +++ b/stdlib/bytes.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Byte sequence operations *) (* WARNING: Some functions in this file are duplicated in string.ml for diff --git a/stdlib/bytesLabels.ml b/stdlib/bytesLabels.ml index d86bc9cd330..c2c00a60162 100644 --- a/stdlib/bytesLabels.ml +++ b/stdlib/bytesLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [BytesLabels]: labelled Bytes module *) [@@@ocaml.nolabels] diff --git a/stdlib/callback.ml b/stdlib/callback.ml index 6880ad4c494..444769a3516 100644 --- a/stdlib/callback.ml +++ b/stdlib/callback.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Registering OCaml values with the C runtime for later callbacks *) external register_named_value : string -> Obj.t -> unit diff --git a/stdlib/camlinternalFormat.ml b/stdlib/camlinternalFormat.ml index 87a3733ec16..b9ab95392b7 100644 --- a/stdlib/camlinternalFormat.ml +++ b/stdlib/camlinternalFormat.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + [@@@ocaml.warning "Ae"] open CamlinternalFormatBasics diff --git a/stdlib/camlinternalLazy.ml b/stdlib/camlinternalLazy.ml index 15f07f67570..6d8205b7149 100644 --- a/stdlib/camlinternalLazy.ml +++ b/stdlib/camlinternalLazy.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Internals of forcing lazy values. *) [@@@ocaml.afl_inst_ratio 0] diff --git a/stdlib/camlinternalMod.ml b/stdlib/camlinternalMod.ml index d1198a3e8bd..3458bbb4f0c 100644 --- a/stdlib/camlinternalMod.ml +++ b/stdlib/camlinternalMod.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + external make_forward : Obj.t -> Obj.t -> unit = "caml_obj_make_forward" type shape = diff --git a/stdlib/camlinternalOO.ml b/stdlib/camlinternalOO.ml index 885449361a9..a3aabd3a69c 100644 --- a/stdlib/camlinternalOO.ml +++ b/stdlib/camlinternalOO.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + [@@@ocaml.inline 0] [@@@ocaml.afl_inst_ratio 0] diff --git a/stdlib/char.ml b/stdlib/char.ml index a7b47b582a0..bbbb9559c4e 100644 --- a/stdlib/char.ml +++ b/stdlib/char.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Character operations *) external code: char -> int = "%identity" diff --git a/stdlib/complex.ml b/stdlib/complex.ml index 3ffd8f80085..01d5ae41b3f 100644 --- a/stdlib/complex.ml +++ b/stdlib/complex.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Complex numbers *) type t = { re: float; im: float } diff --git a/stdlib/digest.ml b/stdlib/digest.ml index 43cdf077df2..7296dae2886 100644 --- a/stdlib/digest.ml +++ b/stdlib/digest.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Message digest (MD5) *) type t = string diff --git a/stdlib/ephemeron.ml b/stdlib/ephemeron.ml index 8537f8cca02..659a1df0209 100644 --- a/stdlib/ephemeron.ml +++ b/stdlib/ephemeron.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + module type SeededS = sig include Hashtbl.SeededS val clean: 'a t -> unit diff --git a/stdlib/filename.ml b/stdlib/filename.ml index e8016746a05..5245e204d7a 100644 --- a/stdlib/filename.ml +++ b/stdlib/filename.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + let generic_quote quotequote s = let l = String.length s in let b = Buffer.create (l + 20) in diff --git a/stdlib/float.ml b/stdlib/float.ml index b46953da4bd..fffe3d28e1b 100644 --- a/stdlib/float.ml +++ b/stdlib/float.ml @@ -16,6 +16,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + [@@@ocaml.nolabels] external neg : float -> float = "%negfloat" diff --git a/stdlib/format.ml b/stdlib/format.ml index e966350ed2a..35b3c757a1c 100644 --- a/stdlib/format.ml +++ b/stdlib/format.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* A pretty-printing facility and definition of formatters for 'parallel' (i.e. unrelated or independent) pretty-printing on multiple out channels. *) diff --git a/stdlib/fun.ml b/stdlib/fun.ml index abbe7a6fb0b..2901f7411fe 100644 --- a/stdlib/fun.ml +++ b/stdlib/fun.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + external id : 'a -> 'a = "%identity" let const c _ = c let flip f x y = f y x diff --git a/stdlib/gc.ml b/stdlib/gc.ml index ddea09d72aa..b3c1d241f9e 100644 --- a/stdlib/gc.ml +++ b/stdlib/gc.ml @@ -16,6 +16,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type stat = { minor_words : float; promoted_words : float; diff --git a/stdlib/genlex.ml b/stdlib/genlex.ml index 63a55a5069b..55b43b7907e 100644 --- a/stdlib/genlex.ml +++ b/stdlib/genlex.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type token = Kwd of string | Ident of string diff --git a/stdlib/hashtbl.ml b/stdlib/hashtbl.ml index 9b0be375cf9..7cc75093228 100644 --- a/stdlib/hashtbl.ml +++ b/stdlib/hashtbl.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Hash tables *) (* We do dynamic hashing, and resize the table and rehash the elements diff --git a/stdlib/int.ml b/stdlib/int.ml index c8c1961e896..8336342afda 100644 --- a/stdlib/int.ml +++ b/stdlib/int.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type t = int let zero = 0 diff --git a/stdlib/int32.ml b/stdlib/int32.ml index d14d2cdd883..d9efef035c7 100644 --- a/stdlib/int32.ml +++ b/stdlib/int32.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Int32]: 32-bit integers *) external neg : int32 -> int32 = "%int32_neg" diff --git a/stdlib/int64.ml b/stdlib/int64.ml index efb771ae371..db1215d5b2d 100644 --- a/stdlib/int64.ml +++ b/stdlib/int64.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Int64]: 64-bit integers *) external neg : int64 -> int64 = "%int64_neg" diff --git a/stdlib/lazy.ml b/stdlib/lazy.ml index ce814147314..9b32ca6089d 100644 --- a/stdlib/lazy.ml +++ b/stdlib/lazy.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Lazy]: deferred computations *) diff --git a/stdlib/lexing.ml b/stdlib/lexing.ml index 753e31a6cf9..f0c00bab8c7 100644 --- a/stdlib/lexing.ml +++ b/stdlib/lexing.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* The run-time library for lexers generated by camllex *) type position = { diff --git a/stdlib/list.ml b/stdlib/list.ml index c194080db89..5ec1e066387 100644 --- a/stdlib/list.ml +++ b/stdlib/list.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* An alias for the type of lists. *) type 'a t = 'a list = [] | (::) of 'a * 'a list diff --git a/stdlib/listLabels.ml b/stdlib/listLabels.ml index 6bfd506d4fa..86656d762c4 100644 --- a/stdlib/listLabels.ml +++ b/stdlib/listLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [ListLabels]: labelled List module *) [@@@ocaml.nolabels] diff --git a/stdlib/map.ml b/stdlib/map.ml index 7f533c1ce2f..4a18c9cbb63 100644 --- a/stdlib/map.ml +++ b/stdlib/map.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + module type OrderedType = sig type t diff --git a/stdlib/marshal.ml b/stdlib/marshal.ml index 2d2a4a095ed..c5ddff467dd 100644 --- a/stdlib/marshal.ml +++ b/stdlib/marshal.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type extern_flags = No_sharing | Closures diff --git a/stdlib/moreLabels.ml b/stdlib/moreLabels.ml index e05f18144bf..d81b839e711 100644 --- a/stdlib/moreLabels.ml +++ b/stdlib/moreLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [MoreLabels]: meta-module for compatibility labelled libraries *) [@@@ocaml.nolabels] diff --git a/stdlib/nativeint.ml b/stdlib/nativeint.ml index 4ed6f81defd..543a183e2b6 100644 --- a/stdlib/nativeint.ml +++ b/stdlib/nativeint.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Nativeint]: processor-native integers *) external neg: nativeint -> nativeint = "%nativeint_neg" diff --git a/stdlib/obj.ml b/stdlib/obj.ml index f909220aa02..15cb798ba81 100644 --- a/stdlib/obj.ml +++ b/stdlib/obj.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Operations on internal representations of values *) type t diff --git a/stdlib/oo.ml b/stdlib/oo.ml index cc79efa5e76..81c686e5bd5 100644 --- a/stdlib/oo.ml +++ b/stdlib/oo.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + let copy = CamlinternalOO.copy external id : < .. > -> int = "%field1" let new_method = CamlinternalOO.public_method_label diff --git a/stdlib/option.ml b/stdlib/option.ml index a129cc63f0e..15a154b78c4 100644 --- a/stdlib/option.ml +++ b/stdlib/option.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type 'a t = 'a option = None | Some of 'a let none = None diff --git a/stdlib/parsing.ml b/stdlib/parsing.ml index aadf6729ed6..9a2198bbe57 100644 --- a/stdlib/parsing.ml +++ b/stdlib/parsing.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* The parsing engine *) open Lexing diff --git a/stdlib/pervasives.ml b/stdlib/pervasives.ml index 1aa2b23ad26..4f9a2d02e46 100644 --- a/stdlib/pervasives.ml +++ b/stdlib/pervasives.ml @@ -14,6 +14,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (** @deprecated Use {!Stdlib} *) external raise : exn -> 'a = "%raise" diff --git a/stdlib/printexc.ml b/stdlib/printexc.ml index 16920c1ff8f..550318f01e8 100644 --- a/stdlib/printexc.ml +++ b/stdlib/printexc.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + open Printf type t = exn = .. diff --git a/stdlib/printf.ml b/stdlib/printf.ml index 5e03d4b4239..103d16c77c6 100644 --- a/stdlib/printf.ml +++ b/stdlib/printf.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + [@@@ocaml.warning "Ae"] open CamlinternalFormatBasics diff --git a/stdlib/queue.ml b/stdlib/queue.ml index 2592cd85f1c..e096dacbeb2 100644 --- a/stdlib/queue.ml +++ b/stdlib/queue.ml @@ -16,6 +16,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + exception Empty type 'a cell = diff --git a/stdlib/random.ml b/stdlib/random.ml index e9b0c38814e..c8fe64f55f1 100644 --- a/stdlib/random.ml +++ b/stdlib/random.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Pseudo-random number generator This is a lagged-Fibonacci F(55, 24, +) with a modified addition function to enhance the mixing of bits. diff --git a/stdlib/result.ml b/stdlib/result.ml index 67fe69fbcaf..82869d2422a 100644 --- a/stdlib/result.ml +++ b/stdlib/result.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type ('a, 'e) t = ('a, 'e) result = Ok of 'a | Error of 'e let ok v = Ok v diff --git a/stdlib/scanf.ml b/stdlib/scanf.ml index 6c9b7ff6f33..7018f35481d 100644 --- a/stdlib/scanf.ml +++ b/stdlib/scanf.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + [@@@ocaml.warning "Ae"] [@@@ocaml.inline "9"] diff --git a/stdlib/seq.ml b/stdlib/seq.ml index cd5aa6f4467..5280e762095 100644 --- a/stdlib/seq.ml +++ b/stdlib/seq.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [Seq]: functional iterators *) type +'a node = diff --git a/stdlib/set.ml b/stdlib/set.ml index 4112ee9e3ed..8e12e5db93b 100644 --- a/stdlib/set.ml +++ b/stdlib/set.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Sets over ordered types *) module type OrderedType = diff --git a/stdlib/stack.ml b/stdlib/stack.ml index bb7ad70349f..12b9e488cfa 100644 --- a/stdlib/stack.ml +++ b/stdlib/stack.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type 'a t = { mutable c : 'a list; mutable len : int; } exception Empty diff --git a/stdlib/stdLabels.ml b/stdlib/stdLabels.ml index 66e90dc2ff1..8d988b4f608 100644 --- a/stdlib/stdLabels.ml +++ b/stdlib/stdLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [StdLabels]: meta-module for labelled libraries *) [@@@ocaml.nolabels] diff --git a/stdlib/std_exit.ml b/stdlib/std_exit.ml index 772ee9c8362..51de635e329 100644 --- a/stdlib/std_exit.ml +++ b/stdlib/std_exit.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Ensure that [at_exit] functions are called at the end of every program *) let _ = do_at_exit() diff --git a/stdlib/stream.ml b/stdlib/stream.ml index b488f7d2b0e..923cd01a439 100644 --- a/stdlib/stream.ml +++ b/stdlib/stream.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type 'a t = 'a cell option and 'a cell = { mutable count : int; mutable data : 'a data } and 'a data = diff --git a/stdlib/string.ml b/stdlib/string.ml index 99f4a5de106..b0a50ff36e1 100644 --- a/stdlib/string.ml +++ b/stdlib/string.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* String operations, based on byte sequence operations *) (* WARNING: Some functions in this file are duplicated in bytes.ml for diff --git a/stdlib/stringLabels.ml b/stdlib/stringLabels.ml index dbffa542379..8153c58001f 100644 --- a/stdlib/stringLabels.ml +++ b/stdlib/stringLabels.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (* Module [StringLabels]: labelled String module *) [@@@ocaml.nolabels] diff --git a/stdlib/uchar.ml b/stdlib/uchar.ml index 939785ae2e1..37e4d73b66b 100644 --- a/stdlib/uchar.ml +++ b/stdlib/uchar.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + external format_int : string -> int -> string = "caml_format_int" let err_no_pred = "U+0000 has no predecessor" diff --git a/stdlib/unit.ml b/stdlib/unit.ml index 1c60ef6208f..2cd4b6fba9d 100644 --- a/stdlib/unit.ml +++ b/stdlib/unit.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + type t = unit = () let equal () () = true diff --git a/stdlib/weak.ml b/stdlib/weak.ml index ac3dc13fe6e..49698cd14da 100644 --- a/stdlib/weak.ml +++ b/stdlib/weak.ml @@ -15,6 +15,8 @@ open! Stdlib +[@@@ocaml.flambda_o3] + (** Weak array operations *) type !'a t diff --git a/testsuite/tests/backtrace/backtrace2.reference b/testsuite/tests/backtrace/backtrace2.reference index b14905ff4cf..c2771c20611 100644 --- a/testsuite/tests/backtrace/backtrace2.reference +++ b/testsuite/tests/backtrace/backtrace2.reference @@ -42,7 +42,7 @@ Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, char Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42 Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 @@ -54,11 +54,11 @@ Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, char Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42 Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41 Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 @@ -66,8 +66,8 @@ Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, character Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 Uncaught exception Not_found Raised at Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 18-33 @@ -77,11 +77,11 @@ Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, char Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found.aux in file "backtrace2.ml", line 36, characters 43-52 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 38, characters 6-11 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 9-42 Re-raised at Backtrace2.test_Not_found in file "backtrace2.ml", line 43, characters 61-70 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41 Re-raised at Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 18-33 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 @@ -89,12 +89,12 @@ Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, character Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 Called from Backtrace2.test_lazy.aux in file "backtrace2.ml", line 47, characters 43-52 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 -Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 541, characters 13-28 +Re-raised at Stdlib__Hashtbl.find in file "hashtbl.ml", line 543, characters 13-28 Called from Backtrace2.test_lazy.exception_raised_internally in file "backtrace2.ml", line 50, characters 8-41 -Re-raised at CamlinternalLazy.force_lazy_block.(fun) in file "camlinternalLazy.ml", line 39, characters 56-63 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Re-raised at CamlinternalLazy.force_lazy_block.(fun) in file "camlinternalLazy.ml", line 41, characters 56-63 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Backtrace2.run in file "backtrace2.ml", line 62, characters 11-23 diff --git a/testsuite/tests/backtrace/lazy.reference b/testsuite/tests/backtrace/lazy.reference index f517c868a0a..dd0afcba0d9 100644 --- a/testsuite/tests/backtrace/lazy.reference +++ b/testsuite/tests/backtrace/lazy.reference @@ -1,17 +1,17 @@ Uncaught exception Not_found Raised at Lazy.l1 in file "lazy.ml", line 7, characters 28-45 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24 Called from Lazy.run in file "lazy.ml", line 19, characters 4-11 Uncaught exception Not_found Raised at Lazy.l1 in file "lazy.ml", line 7, characters 28-45 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Lazy.test1 in file "lazy.ml", line 10, characters 11-24 Called from Lazy.run in file "lazy.ml", line 19, characters 4-11 Re-raised at Lazy.l2 in file "lazy.ml", line 12, characters 28-45 -Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 35, characters 17-27 -Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 40, characters 4-11 +Called from CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 37, characters 17-27 +Re-raised at CamlinternalLazy.force_lazy_block in file "camlinternalLazy.ml", line 42, characters 4-11 Called from Lazy.test2 in file "lazy.ml", line 15, characters 6-15 Called from Lazy.run in file "lazy.ml", line 19, characters 4-11 diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference index 06912a35b37..3abfbd514bd 100755 --- a/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference +++ b/testsuite/tests/lib-dynlink-initializers/test10_main.byte.reference @@ -6,7 +6,7 @@ Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6 Called from Dynlink.Bytecode.run in file "otherlibs/dynlink/dynlink.ml", line 137, characters 16-25 Re-raised at Dynlink.Bytecode.run in file "otherlibs/dynlink/dynlink.ml", line 139, characters 6-137 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 355, characters 8-17 Called from Test10_main in file "test10_main.ml", line 51, characters 13-69 diff --git a/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference b/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference index efc1a137c87..dfd8e003d67 100755 --- a/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference +++ b/testsuite/tests/lib-dynlink-initializers/test10_main.native.reference @@ -5,9 +5,9 @@ Called from Test10_plugin in file "test10_plugin.ml", line 10, characters 2-6 Called from Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 85, characters 12-29 Called from Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 85, characters 12-29 Re-raised at Dynlink.Native.run.(fun) in file "otherlibs/dynlink/native/dynlink.ml", line 87, characters 10-149 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Dynlink_common.Make.load.(fun) in file "otherlibs/dynlink/dynlink_common.ml", line 347, characters 13-44 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 345, characters 8-240 Re-raised at Dynlink_common.Make.load in file "otherlibs/dynlink/dynlink_common.ml", line 355, characters 8-17 Called from Dynlink_common.Make.loadfile in file "otherlibs/dynlink/dynlink_common.ml" (inlined), line 357, characters 26-45 diff --git a/testsuite/tests/statmemprof/callstacks.flat-float-array.reference b/testsuite/tests/statmemprof/callstacks.flat-float-array.reference index fa78902000f..b69bba0972c 100644 --- a/testsuite/tests/statmemprof/callstacks.flat-float-array.reference +++ b/testsuite/tests/statmemprof/callstacks.flat-float-array.reference @@ -1,74 +1,74 @@ ----------- Raised by primitive operation at Callstacks.alloc_list_literal in file "callstacks.ml", line 18, characters 30-53 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_pair in file "callstacks.ml", line 21, characters 30-76 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_record in file "callstacks.ml", line 26, characters 12-66 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_some in file "callstacks.ml", line 29, characters 30-60 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_array_literal in file "callstacks.ml", line 32, characters 30-55 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_float_array_literal in file "callstacks.ml", line 36, characters 12-62 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.do_alloc_unknown_array_literal in file "callstacks.ml", line 39, characters 22-27 Called from Callstacks.alloc_unknown_array_literal in file "callstacks.ml", line 41, characters 30-65 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_small_array in file "callstacks.ml", line 44, characters 30-69 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_large_array in file "callstacks.ml", line 47, characters 30-73 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_closure.(fun) in file "callstacks.ml", line 51, characters 30-43 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.get0 in file "callstacks.ml", line 54, characters 28-33 Called from Callstacks.getfloatfield in file "callstacks.ml", line 56, characters 30-47 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- -Raised by primitive operation at Stdlib__Marshal.from_bytes in file "marshal.ml", line 63, characters 9-35 +Raised by primitive operation at Stdlib__Marshal.from_bytes in file "marshal.ml", line 65, characters 9-35 Called from Callstacks.alloc_unmarshal in file "callstacks.ml", line 62, characters 12-87 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.alloc_ref in file "callstacks.ml", line 65, characters 30-59 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 ----------- Raised by primitive operation at Callstacks.prod_floats in file "callstacks.ml", line 68, characters 37-43 Called from Callstacks.alloc_boxedfloat in file "callstacks.ml", line 70, characters 30-49 Called from Callstacks.test in file "callstacks.ml", line 92, characters 2-10 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Callstacks in file "callstacks.ml", line 99, characters 2-27 diff --git a/testsuite/tests/statmemprof/comballoc.byte.reference b/testsuite/tests/statmemprof/comballoc.byte.reference index 98c4fd718d9..156768ae61b 100644 --- a/testsuite/tests/statmemprof/comballoc.byte.reference +++ b/testsuite/tests/statmemprof/comballoc.byte.reference @@ -1,49 +1,49 @@ 2: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.42 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.01 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.83 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml", line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 OK diff --git a/testsuite/tests/statmemprof/comballoc.opt.reference b/testsuite/tests/statmemprof/comballoc.opt.reference index b6bd4f18fe8..d557a37c0e4 100644 --- a/testsuite/tests/statmemprof/comballoc.opt.reference +++ b/testsuite/tests/statmemprof/comballoc.opt.reference @@ -1,49 +1,49 @@ 2: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.42 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.42 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.01 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.01 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 2: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 2-19 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 3: 0.83 false Raised by primitive operation at Comballoc.f in file "comballoc.ml", line 14, characters 6-18 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 4: 0.83 true Raised by primitive operation at Comballoc.f4 in file "comballoc.ml" (inlined), line 11, characters 11-20 Called from Comballoc.f in file "comballoc.ml", line 14, characters 13-17 Called from Comballoc.test in file "comballoc.ml", line 39, characters 25-48 -Called from Stdlib__List.iter in file "list.ml", line 112, characters 12-15 +Called from Stdlib__List.iter in file "list.ml", line 114, characters 12-15 Called from Comballoc in file "comballoc.ml", line 69, characters 2-35 OK diff --git a/testsuite/tests/tool-toplevel/pr6468.compilers.reference b/testsuite/tests/tool-toplevel/pr6468.compilers.reference index 45a29149d7a..29d1c5e6fe1 100644 --- a/testsuite/tests/tool-toplevel/pr6468.compilers.reference +++ b/testsuite/tests/tool-toplevel/pr6468.compilers.reference @@ -8,7 +8,7 @@ val g : unit -> int = Exception: Not_found. Raised at f in file "//toplevel//", line 2, characters 11-26 Called from g in file "//toplevel//", line 1, characters 11-15 -Called from Stdlib__Fun.protect in file "fun.ml", line 35, characters 8-15 -Re-raised at Stdlib__Fun.protect in file "fun.ml", line 40, characters 6-52 +Called from Stdlib__Fun.protect in file "fun.ml", line 37, characters 8-15 +Re-raised at Stdlib__Fun.protect in file "fun.ml", line 42, characters 6-52 Called from Toploop.load_lambda in file "toplevel/toploop.ml", line 212, characters 4-150