---

yaml
---
r: 12627
b: refs/heads/master
c: b88ecec
h: refs/heads/master
i:
  12625: 253a02a
  12623: 100e83c
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 06afe21c033abf370825034f3b1639a80386da6d
+refs/heads/master: b88ecec08c9998c08ef8fafe5ac49c17bc99c516
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/ty.rs

@@ -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: