nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-10 23:06:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the way freevars stores its information again.

Browse Source
This commit is contained in:
Michael Sullivan 2011-07-28 18:38:27 -07:00
parent 5068ae4771
commit 2c0f4d51f9
3 changed files with 37 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/comp/middle/freevars.rs
View File

@ -18,13 +18,19 @@ export freevar_set;
export freevar_map;
export get_freevar_info;
export get_freevars;
export get_freevar_uses;
export get_freevar_refs;
export has_freevars;
export is_freevar_of;
export def_lookup;
// Throughout the compiler, variables are generally dealt with using the
// node_ids of the reference sites and not the def_id of the definition
// site. Thus we store a set are the definitions along with a vec of one
// referencing node_id per free variable. The set is useful for testing
// membership, the list of referencing sites is what you want for most
// other things.
type freevar_set = hashset[ast::node_id];
type freevar_info = {defs: freevar_set, uses: @ast::node_id[]};
type freevar_info = {defs: freevar_set, refs: @ast::node_id[]};
type freevar_map = hashmap[ast::node_id, freevar_info];
// Searches through part of the AST for all references to locals or
@ -83,17 +89,17 @@ fn collect_freevars(def_map: &resolve::def_map, sess: &session::session,
// Calculate (refs - decls). This is the set of captured upvars.
// We build a vec of the node ids of the uses and a set of the
// node ids of the definitions.
let uses = ~[];
let refs = ~[];
let defs = new_int_hash();
for ref_id_: ast::node_id in e.refs {
let ref_id = ref_id_;
let def_id = ast::def_id_of_def(def_map.get(ref_id)).node;
if !decls.contains_key(def_id) {
uses += ~[ref_id];
if !decls.contains_key(def_id) && !defs.contains_key(def_id) {
refs += ~[ref_id];
set_add(defs, def_id);
}
}
ret {defs: defs, uses: @uses};
ret {defs: defs, refs: @refs};
}
// Build a map from every function and for-each body to a set of the
@ -150,17 +156,17 @@ fn get_freevar_info(tcx: &ty::ctxt, fid: ast::node_id) -> freevar_info {
some(d) { ret d; }
}
}
fn get_freevars(tcx: &ty::ctxt, fid: ast::node_id) -> freevar_set {
fn get_freevar_refs(tcx: &ty::ctxt, fid: ast::node_id) -> freevar_set {
ret get_freevar_info(tcx, fid).defs;
}
fn get_freevar_uses(tcx: &ty::ctxt, fid: ast::node_id) -> @ast::node_id[] {
ret get_freevar_info(tcx, fid).uses;
fn get_freevars(tcx: &ty::ctxt, fid: ast::node_id) -> @ast::node_id[] {
ret get_freevar_info(tcx, fid).refs;
}
fn has_freevars(tcx: &ty::ctxt, fid: ast::node_id) -> bool {
ret get_freevars(tcx, fid).size() != 0u;
ret get_freevar_refs(tcx, fid).size() != 0u;
}
fn is_freevar_of(tcx: &ty::ctxt, var: ast::node_id, f: ast::node_id) -> bool {
ret get_freevars(tcx, f).contains_key(var);
fn is_freevar_of(tcx: &ty::ctxt, def: ast::node_id, f: ast::node_id) -> bool {
ret get_freevar_refs(tcx, f).contains_key(def);
}
fn def_lookup(tcx: &ty::ctxt, f: ast::node_id, id: ast::node_id) ->
option::t[ast::def] {

51
src/comp/middle/trans.rs
View File

@ -3677,30 +3677,6 @@ fn trans_for(cx: &@block_ctxt, local: &@ast::local, seq: &@ast::expr,
// Iterator translation
// Finds the ValueRef associated with a variable in a function
// context. It checks locals, upvars, and args.
fn find_variable(cx: &@block_ctxt, nid: ast::node_id) -> lval_result {
let fcx = cx.fcx;
let llval = alt fcx.lllocals.find(nid) {
none. {
alt fcx.llupvars.find(nid) {
none. {
alt fcx.llargs.find(nid) {
some(llval) { llval }
_ {
fcx.lcx.ccx.sess.bug("unbound var in build_environment "
+ int::str(nid))
}
}
}
some(llval) { llval }
}
}
some(llval) { llval }
};
ret lval_mem(cx, llval);
}
// build_environment_heap and build_environment are very similar. It
// would be nice to unify them.
@ -3781,12 +3757,12 @@ fn build_environment_heap(bcx: @block_ctxt, lltydescs: ValueRef[],
// Given a block context and a list of upvars, construct a closure that
// contains pointers to all of the upvars and all of the tydescs in
// scope. Return the ValueRef and TypeRef corresponding to the closure.
fn build_environment(cx: &@block_ctxt, upvars: &freevar_set) ->
fn build_environment(cx: &@block_ctxt, upvars: &@ast::node_id[]) ->
{ptr: ValueRef, ptrty: TypeRef} {
let has_iterbody = !option::is_none(cx.fcx.lliterbody);
let llbindingsptr;
if upvars.size() > 0u || has_iterbody {
if std::ivec::len(*upvars) > 0u || has_iterbody {
// Gather up the upvars.
let llbindings: ValueRef[] = ~[];
let llbindingtys: TypeRef[] = ~[];
@ -3794,8 +3770,8 @@ fn build_environment(cx: &@block_ctxt, upvars: &freevar_set) ->
llbindings += ~[option::get(cx.fcx.lliterbody)];
llbindingtys += ~[val_ty(llbindings.(0))];
}
for each nid: ast::node_id in upvars.keys() {
let llbinding = find_variable(cx, nid).res.val;
for nid: ast::node_id in *upvars {
let llbinding = trans_var(cx, cx.sp, nid).res.val;
llbindings += ~[llbinding];
llbindingtys += ~[val_ty(llbinding)];
}
@ -3847,7 +3823,7 @@ fn build_environment(cx: &@block_ctxt, upvars: &freevar_set) ->
// and a list of upvars, generate code to load and populate the environment
// with the upvars and type descriptors.
fn load_environment(cx: &@block_ctxt, fcx: &@fn_ctxt, llenvptrty: TypeRef,
upvars: &freevar_set) {
upvars: &@ast::node_id[]) {
let copy_args_bcx = new_raw_block_ctxt(fcx, fcx.llcopyargs);
// Populate the upvars from the environment.
@ -3869,12 +3845,13 @@ fn load_environment(cx: &@block_ctxt, fcx: &@fn_ctxt, llenvptrty: TypeRef,
let lliterbody = copy_args_bcx.build.Load(lliterbodyptr);
fcx.lliterbody = some(lliterbody);
}
for each upvar_id: ast::node_id in upvars.keys() {
for upvar_id: ast::node_id in *upvars {
let llupvarptrptr =
copy_args_bcx.build.GEP(llremotebindingsptr,
~[C_int(0), C_int(i as int)]);
let llupvarptr = copy_args_bcx.build.Load(llupvarptrptr);
fcx.llupvars.insert(upvar_id, llupvarptr);
let def_id = ast::def_id_of_def(bcx_tcx(cx).def_map.get(upvar_id));
fcx.llupvars.insert(def_id.node, llupvarptr);
i += 1u;
}
@ -4092,9 +4069,12 @@ fn lookup_discriminant(lcx: &@local_ctxt, tid: &ast::def_id,
}
}
fn trans_path(cx: &@block_ctxt, p: &ast::path, id: ast::node_id) ->
fn trans_var(cx: &@block_ctxt, sp: &span, id: ast::node_id) ->
lval_result {
let ccx = bcx_ccx(cx);
// If we had a good way to get at the node_id for the function we
// are in, we could do a freevars::def_lookup and avoid having to
// check the llupvars case in all of the other cases...
alt bcx_tcx(cx).def_map.find(id) {
some(ast::def_arg(did)) {
alt cx.fcx.llargs.find(did.node) {
@ -4144,7 +4124,7 @@ fn trans_path(cx: &@block_ctxt, p: &ast::path, id: ast::node_id) ->
let tag_ty = node_id_type(ccx, id);
let alloc_result = alloc_ty(cx, tag_ty);
let lltagblob = alloc_result.val;
let lltagty = type_of_tag(ccx, p.span, tid, tag_ty);
let lltagty = type_of_tag(ccx, sp, tid, tag_ty);
let bcx = alloc_result.bcx;
let lltagptr = bcx.build.PointerCast(lltagblob, T_ptr(lltagty));
if std::ivec::len(ty::tag_variants(ccx.tcx, tid)) != 1u {
@ -4180,6 +4160,11 @@ fn trans_path(cx: &@block_ctxt, p: &ast::path, id: ast::node_id) ->
}
}
fn trans_path(cx: &@block_ctxt, p: &ast::path, id: ast::node_id) ->
lval_result {
ret trans_var(cx, p.span, id);
}
fn trans_field(cx: &@block_ctxt, sp: &span, v: ValueRef, t0: &ty::t,
field: &ast::ident, id: ast::node_id) -> lval_result {
let r = autoderef(cx, v, t0);

2
src/comp/middle/tstate/pre_post_conditions.rs
View File

@ -371,7 +371,7 @@ fn find_pre_post_expr(fcx: &fn_ctxt, e: @expr) {
expr_fn(f) {
let rslt = expr_pp(fcx.ccx, e);
clear_pp(rslt);
let upvars = freevars::get_freevar_uses(fcx.ccx.tcx, e.id);
let upvars = freevars::get_freevars(fcx.ccx.tcx, e.id);
for id: node_id in *upvars { handle_var(fcx, rslt, id, "upvar"); }
}
expr_block(b) {