mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bad output-slot logic in tag constructors.

Browse Source
This commit is contained in:
Graydon Hoare 2010-06-24 18:25:10 -07:00
parent bcf29b882a
commit 1c60be2f32
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/boot/me/trans.ml
View File

@ -4675,21 +4675,24 @@ let trans_visitor
let tag_keys = sorted_htab_keys ttag in let tag_keys = sorted_htab_keys ttag in
let i = arr_idx tag_keys (Ast.NAME_base (Ast.BASE_ident n)) in let i = arr_idx tag_keys (Ast.NAME_base (Ast.BASE_ident n)) in
let _ = log cx "tag variant: %s -> tag value #%d" n i in let _ = log cx "tag variant: %s -> tag value #%d" n i in
let out_cell = deref (ptr_at (fp_imm out_mem_disp) (Ast.TY_tag ttag)) in let (dst_cell, dst_slot) = get_current_output_cell_and_slot() in
let tag_cell = get_element_ptr out_cell 0 in let dst_cell = deref_slot true dst_cell dst_slot in
let union_cell = get_element_ptr_dyn_in_current_frame out_cell 1 in
let dst = get_variant_ptr union_cell i in
let dst_ty = snd (need_mem_cell dst) in
let src = get_explicit_args_for_current_frame () in let src = get_explicit_args_for_current_frame () in
let tag_cell = get_element_ptr dst_cell 0 in
let union_cell = get_element_ptr_dyn_in_current_frame dst_cell 1 in
let tag_body_cell = get_variant_ptr union_cell i in
let tag_body_rty = snd (need_mem_cell tag_body_cell) in
(* A clever compiler will inline this. We are not clever. *) (* A clever compiler will inline this. We are not clever. *)
iflog (fun _ -> annotate (Printf.sprintf "write tag #%d" i)); iflog (fun _ -> annotate (Printf.sprintf "write tag #%d" i));
mov tag_cell (imm (Int64.of_int i)); mov tag_cell (imm (Int64.of_int i));
iflog (fun _ -> annotate ("copy tag-content tuple: dst_ty=" ^ iflog (fun _ -> annotate ("copy tag-content tuple: tag_body_rty=" ^
(Il.string_of_referent_ty dst_ty))); (Il.string_of_referent_ty tag_body_rty)));
trans_copy_tup (get_ty_params_of_current_frame()) true dst src slots; trans_copy_tup
trace_str cx.ctxt_sess.Session.sess_trace_tag (get_ty_params_of_current_frame())
("finished tag constructor " ^ n); true tag_body_cell src slots;
trans_frame_exit tagid true; trace_str cx.ctxt_sess.Session.sess_trace_tag
("finished tag constructor " ^ n);
trans_frame_exit tagid true;
in in
let enter_file_for id = let enter_file_for id =

10
src/test/run-pass/mlist-cycle.rs
View File

@ -1,10 +1,10 @@
// -*- rust -*- // -*- rust -*-
type pair = rec(int head, mutable @mlist tail); type cell = tup(mutable @list);
type mlist = tag(cons(@pair), nil()); type list = tag(link(@cell), nil());
fn main() { fn main() {
let @pair p = rec(head=10, tail=mutable nil()); let @cell first = tup(@nil());
let @mlist cycle = cons(p); let @cell second = tup(@link(first));
//p.tail = cycle; first._0 = link(second);
} }