---

yaml
---
r: 2196
b: refs/heads/master
c: 9ab9bd9
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2361b655261ad48d0eefdaf706ecac6af819e9ad
+refs/heads/master: 9ab9bd9cc2dc97c2acc26849dd24b8989b76ea32

trunk/src/comp/middle/ty.rs

@@ -2484,17 +2484,17 @@ fn lookup_item_type(session.session sess,
     if (did._0 == sess.get_targ_crate_num()) {
         // The item is in this crate. The caller should have added it to the
         // type cache already; we simply return it.
-        check (cache.contains_key(did));
         ret cache.get(did);
     }
 
-    if (cache.contains_key(did)) {
-        ret cache.get(did);
+    alt (cache.find(did)) {
+        case (some[ty_param_count_and_ty](?tpt)) { ret tpt; }
+        case (none[ty_param_count_and_ty]) {
+            auto tyt = creader.get_type(sess, tystore, did);
+            cache.insert(did, tyt);
+            ret tyt;
+        }
     }
-
-    auto tyt = creader.get_type(sess, tystore, did);
-    cache.insert(did, tyt);
-    ret tyt;
 }