---

yaml
---
r: 4932
b: refs/heads/master
c: 8bd019b
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 608f7ccded67fd65d5e12ef2c0601170fb3345ed
+refs/heads/master: 8bd019bdc868e9d563aa72acbb0307deaeca919f

trunk/src/comp/middle/trans.rs

@@ -958,10 +958,13 @@ fn get_derived_tydesc(cx: &@block_ctxt, t: ty::t, escapes: bool,
 
         // If the tydesc escapes in this context, the cached derived
         // tydesc also has to be one that was marked as escaping.
-        if !(escapes && !info.escapes) { ret rslt(cx, info.lltydesc); }
+        if !(escapes && !info.escapes) && storage == tps_normal {
+            ret rslt(cx, info.lltydesc);
+        }
       }
       none. {/* fall through */ }
     }
+
     bcx_ccx(cx).stats.n_derived_tydescs += 1u;
     let bcx = new_raw_block_ctxt(cx.fcx, cx.fcx.llderivedtydescs);
     let tys = linearize_ty_params(bcx, t);

trunk/src/rt/rust_crate_cache.cpp

@@ -1,5 +1,6 @@
 
 #include "rust_internal.h"
+#include <algorithm>
 
 type_desc *
 rust_crate_cache::get_type_desc(size_t size,
@@ -14,6 +15,10 @@ rust_crate_cache::get_type_desc(size_t size,
     HASH_FIND(hh, this->type_descs, descs, keysz, td);
     if (td) {
         DLOG(sched, cache, "rust_crate_cache::get_type_desc hit");
+
+        // FIXME: This is a gross hack.
+        td->n_obj_params = std::max(td->n_obj_params, n_obj_params);
+
         return td;
     }
     DLOG(sched, cache, "rust_crate_cache::get_type_desc miss");

trunk/src/rt/rust_shape.h

@@ -259,6 +259,9 @@ class type_param {
     // Creates type parameters from a type descriptor.
     static inline type_param *from_tydesc(const type_desc *tydesc,
                                           arena &arena) {
+        if (tydesc->n_obj_params) {
+            // TODO
+        }
         return make(tydesc->first_param, tydesc->n_params, arena);
     }
 };