OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "rustc: Cache normalized types"

Browse Source 
This reverts commit 06afe21c03.
This commit is contained in:
Brian Anderson 2012-04-24 20:47:00 -07:00
parent 06afe21c03
commit b88ecec08c
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/rustc/middle/ty.rs
View File

@ -227,8 +227,7 @@ type ctxt =
iface_method_cache: hashmap<def_id, @[method]>,
ty_param_bounds: hashmap<ast::node_id, param_bounds>,
inferred_modes: hashmap<ast::node_id, ast::mode>,
borrowings: hashmap<ast::node_id, ()>,
normalized_cache: hashmap<t, t>};
borrowings: hashmap<ast::node_id, ()>};
type t_box = @{struct: sty,
id: uint,
@ -462,8 +461,7 @@ fn mk_ctxt(s: session::session, dm: resolve::def_map, amap: ast_map::map,
iface_method_cache: new_def_hash(),
ty_param_bounds: map::int_hash(),
inferred_modes: map::int_hash(),
borrowings: map::int_hash(),
normalized_cache: new_ty_hash()}
borrowings: map::int_hash()}
}
@ -2682,11 +2680,6 @@ fn ty_params_to_tys(tcx: ty::ctxt, tps: [ast::ty_param]) -> [t] {
Returns an equivalent type with all the typedefs and self regions removed
"]
fn normalize_ty(cx: ctxt, t: t) -> t {
alt cx.normalized_cache.find(t) {
some(t) { ret t; }
none { }
}
let t = alt get(t).struct {
ty_enum(did, r) {
alt r.self_r {
@ -2700,9 +2693,7 @@ fn normalize_ty(cx: ctxt, t: t) -> t {
_ { t }
};
let sty = fold_sty(get(t).struct) {|t| normalize_ty(cx, t) };
let t_norm = mk_t(cx, sty);
cx.normalized_cache.insert(t, t_norm);
ret t_norm;
mk_t(cx, sty)
}
// Local Variables: