diff options
| author | Graydon Hoare <[email protected]> | 2010-08-25 16:36:18 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-08-25 16:36:18 -0700 |
| commit | 2c8ae5ca8dd423443e44e3f0863f3c50b3126cd2 (patch) | |
| tree | dbeee2bb393721d22fd85827dbb30702bbfb6c22 /src/boot/me/semant.ml | |
| parent | Merge obj-drop and closure-drop code, handles freeing bound exteriors now. (diff) | |
| download | rust-2c8ae5ca8dd423443e44e3f0863f3c50b3126cd2.tar.xz rust-2c8ae5ca8dd423443e44e3f0863f3c50b3126cd2.zip | |
Add element to closure to hold captured tydesc (not body tydesc).
Diffstat (limited to 'src/boot/me/semant.ml')
| -rw-r--r-- | src/boot/me/semant.ml | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/boot/me/semant.ml b/src/boot/me/semant.ml index be777bc6..3f98488c 100644 --- a/src/boot/me/semant.ml +++ b/src/boot/me/semant.ml @@ -1905,8 +1905,6 @@ let obj_rty (word_bits:Il.bits) : Il.referent_ty = r [| obj_vtbl_ptr; obj_box_ptr |] ;; - - let rec closure_box_rty (word_bits:Il.bits) (bs:Ast.slot array) @@ -1920,8 +1918,9 @@ let rec closure_box_rty let tydesc = sp (tydesc_rty word_bits) in let targ = fn_rty true word_bits in let bound_args = r (Array.map (slot_referent_type word_bits) bs) in - - r [| rc; r [| tydesc; targ; bound_args |] |] + (* First tydesc is the one describing bound_args; second tydesc is the one + * to pass to targ when invoking it. *) + r [| rc; r [| tydesc; tydesc; targ; bound_args |] |] and fn_rty (opaque_box_body:bool) (word_bits:Il.bits) : Il.referent_ty = let s t = Il.ScalarTy t in |