rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustc: Allow the addresses of rvalues to be taken

Browse Source
This commit is contained in:
Patrick Walton
2012-03-13 18:23:33 -07:00
parent ffc1d0a55d
commit c3516f091b
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/rustc/middle/region.rs
View File

@@ -40,7 +40,12 @@ type region_map = {
/* Mapping from an AST type node to the region that `&` resolves to. */ /* Mapping from an AST type node to the region that `&` resolves to. */
ast_type_to_inferred_region: hashmap<ast::node_id,ty::region>, ast_type_to_inferred_region: hashmap<ast::node_id,ty::region>,
/* Mapping from a call site (or `bind` site) to its containing block. */ /* Mapping from a call site (or `bind` site) to its containing block. */
call_site_to_block: hashmap<ast::node_id,ast::node_id> call_site_to_block: hashmap<ast::node_id,ast::node_id>,
/*
* Mapping from an address-of operator or alt expression to its containing
* block. This is used as the region if the operand is an rvalue.
*/
rvalue_to_block: hashmap<ast::node_id,ast::node_id>
}; };
type ctxt = { type ctxt = {
@@ -249,6 +254,17 @@ fn resolve_expr(expr: @ast::expr, cx: ctxt, visitor: visit::vt<ctxt>) {
} }
visit::visit_expr(expr, cx, visitor); visit::visit_expr(expr, cx, visitor);
} }
ast::expr_addr_of(_, _) | ast::expr_alt(_, _, _) {
// Record the block that this expression appears in, in case the
// operand is an rvalue.
alt cx.parent {
pa_block(blk_id) {
cx.region_map.rvalue_to_block.insert(expr.id, blk_id);
}
_ { cx.sess.span_bug(expr.span, "expr outside of block?!"); }
}
visit::visit_expr(expr, cx, visitor);
}
_ { visit::visit_expr(expr, cx, visitor); } _ { visit::visit_expr(expr, cx, visitor); }
} }
} }
@@ -276,7 +292,8 @@ fn resolve_crate(sess: session, def_map: resolve::def_map, crate: @ast::crate)
region_name_to_fn: new_def_hash(), region_name_to_fn: new_def_hash(),
ast_type_to_inferred_region: ast_type_to_inferred_region:
map::new_int_hash(), map::new_int_hash(),
call_site_to_block: map::new_int_hash()}, call_site_to_block: map::new_int_hash(),
rvalue_to_block: map::new_int_hash()},
mut bindings: @list::nil, mut bindings: @list::nil,
mut queued_locals: [], mut queued_locals: [],
parent: pa_crate, parent: pa_crate,

4
src/rustc/middle/typeck.rs
View File

@@ -1931,8 +1931,8 @@ fn region_of(fcx: @fn_ctxt, expr: @ast::expr) -> ty::region {
"index, or deref operations"); "index, or deref operations");
} }
_ { _ {
fcx.ccx.tcx.sess.span_err(expr.span, "not an lvalue"); let blk_id = fcx.ccx.tcx.region_map.rvalue_to_block.get(expr.id);
ret ty::re_block(0); ret ty::re_block(blk_id);
} }
} }
} }