summaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorMark Shinwell <mshinwell@janestreet.com>2016-01-14 16:47:31 +0000
committerMark Shinwell <mshinwell@janestreet.com>2016-01-14 16:47:31 +0000
commit5548d4e3ed1a4b1326b2156dd52749fcf23b8558 (patch)
tree1d210a5f3bee8e07c10fe295447bdfdfea244b90 /stdlib
parent790016a297abd916db75ef5a1d6089642b6c86a5 (diff)
parent9842eeb2becfae2e252b79eb4fd0bef2285a554b (diff)
downloadocaml-5548d4e3ed1a4b1326b2156dd52749fcf23b8558.tar.gz
Merge remote-tracking branch 'ocaml/trunk' into flambda_prereq-popaque
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/obj.mli5
1 files changed, 5 insertions, 0 deletions
diff --git a/stdlib/obj.mli b/stdlib/obj.mli
index fecac323ea..462963416d 100644
--- a/stdlib/obj.mli
+++ b/stdlib/obj.mli
@@ -27,7 +27,12 @@ external tag : t -> int = "caml_obj_tag"
external set_tag : t -> int -> unit = "caml_obj_set_tag"
external size : t -> int = "%obj_size"
external field : t -> int -> t = "%obj_field"
+
+(** When using flambda:
+ [set_field] MUST NOT be called on immutable blocks. (Blocks allocated
+ in C stubs, or with [new_block] below, are always considered mutable.) *)
external set_field : t -> int -> t -> unit = "%obj_set_field"
+
val double_field : t -> int -> float (* @since 3.11.2 *)
val set_double_field : t -> int -> float -> unit (* @since 3.11.2 *)
external new_block : int -> int -> t = "caml_obj_block"