aboutsummaryrefslogtreecommitdiff
path: root/src/boot/me/layout.ml
diff options
context:
space:
mode:
authorGraydon Hoare <[email protected]>2010-06-30 22:45:54 -0700
committerGraydon Hoare <[email protected]>2010-06-30 22:45:54 -0700
commit6a0b06e56287f1de7ff096ed79fbf86e1e527290 (patch)
tree5596e1e36c3f59dc7f25c84730705aaf28128a0b /src/boot/me/layout.ml
parentNo more "transplant" behavior in "let @x = y", gotta box explicitly. (diff)
downloadrust-6a0b06e56287f1de7ff096ed79fbf86e1e527290.tar.xz
rust-6a0b06e56287f1de7ff096ed79fbf86e1e527290.zip
Rename 'exterior' to 'box' and 'interior' to 'local' (at least wrt. slots; keep MEM_interior for describing interior-parts-of-allocations)
Diffstat (limited to 'src/boot/me/layout.ml')
-rw-r--r--src/boot/me/layout.ml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/boot/me/layout.ml b/src/boot/me/layout.ml
index 6c4567fd..208dc470 100644
--- a/src/boot/me/layout.ml
+++ b/src/boot/me/layout.ml
@@ -221,7 +221,7 @@ let layout_visitor
let offset =
let word_sz = cx.ctxt_abi.Abi.abi_word_sz in
let word_n (n:int) = Int64.mul word_sz (Int64.of_int n) in
- SIZE_fixed (word_n (Abi.exterior_rc_slot_field_body
+ SIZE_fixed (word_n (Abi.box_rc_slot_field_body
+ 1 (* the state tydesc. *)))
in
log cx "laying out object-state for node #%d at offset %s"
@@ -262,7 +262,7 @@ let layout_visitor
*)
let glue_callsz =
- let word = interior_slot Ast.TY_int in
+ let word = local_slot Ast.TY_int in
let glue_fn =
mk_simple_ty_fn
(Array.init Abi.worst_case_glue_call_args (fun _ -> word))