bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Revert previous wrong-change on issue #106; was papering over wrongness in the runtime. Sad times. Closes #106 more correctly (and adds comment to explain).

Browse source
This commit is contained in:
Graydon Hoare 2010-07-12 13:25:59 -07:00
parent 7c837b8c9b
commit 1843c99b66
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/boot/me/typestate.ml
View file

@ -1044,8 +1044,16 @@ let lifecycle_visitor
Ast.STMT_ret _ Ast.STMT_ret _
| Ast.STMT_be _ -> | Ast.STMT_be _ ->
() (* Taken care of in visit_stmt_post below. *) () (* Taken care of in visit_stmt_post below. *)
| _ -> | _ ->
let slots = stk_elts_from_bot blk_slots in (* The blk_slots stack we have has accumulated slots in
* declaration order as we walked the block; the top of the
* stack is the last-declared slot. We want to generate
* slot-drop obligations here for the slots in top-down order
* (starting with the last-declared) but only hitting those
* slots that actually got initialized (went live) at some
* point in the block.
*)
let slots = stk_elts_from_top blk_slots in
let live = let live =
List.filter List.filter
(fun i -> Hashtbl.mem live_block_slots i) (fun i -> Hashtbl.mem live_block_slots i)
@ -1122,7 +1130,7 @@ let lifecycle_visitor
(fst f.Ast.for_each_slot).id (fst f.Ast.for_each_slot).id
| _ -> () | _ -> ()
end; end;
inner.Walk.visit_stmt_pre s inner.Walk.visit_stmt_pre s
in in
@ -1133,7 +1141,7 @@ let lifecycle_visitor
Ast.STMT_ret _ Ast.STMT_ret _
| Ast.STMT_be _ -> | Ast.STMT_be _ ->
let stks = stk_elts_from_top block_slots in let stks = stk_elts_from_top block_slots in
let slots = List.concat (List.map stk_elts_from_bot stks) in let slots = List.concat (List.map stk_elts_from_top stks) in
let live = let live =
List.filter List.filter
(fun i -> Hashtbl.mem live_block_slots i) (fun i -> Hashtbl.mem live_block_slots i)