---

yaml
---
r: 6716
b: refs/heads/master
c: 1e3259e
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d381cc072a9c9c0fef605c56ed77d538a49c8ead
+refs/heads/master: 1e3259e119b6370267415b9e07f3ea80869f839d

trunk/src/comp/back/abi.rs

@@ -73,9 +73,8 @@ const fn_field_code: int = 0;
 const fn_field_box: int = 1;
 
 const closure_elt_tydesc: int = 0;
-const closure_elt_bindings: int = 1;
-//const closure_elt_n_ty_params: int = 2;
-const closure_elt_ty_params: int = 2; // 3;
+const closure_elt_ty_params: int = 1;
+const closure_elt_bindings: int = 2;
 
 const vec_elt_fill: int = 0;
 

trunk/src/comp/back/upcall.rs

@@ -17,7 +17,8 @@ type upcalls =
      shared_malloc: ValueRef,
      shared_free: ValueRef,
      mark: ValueRef,
-     clone_type_desc: ValueRef,
+     create_shared_type_desc: ValueRef,
+     free_shared_type_desc: ValueRef,
      get_type_desc: ValueRef,
      vec_grow: ValueRef,
      vec_push: ValueRef,
@@ -64,9 +65,11 @@ fn declare_upcalls(targ_cfg: @session::config,
               dv("shared_free", [T_ptr(T_i8())]),
           mark:
               d("mark", [T_ptr(T_i8())], int_t),
-          clone_type_desc:
-              d("clone_type_desc", [T_ptr(tydesc_type)],
+          create_shared_type_desc:
+              d("create_shared_type_desc", [T_ptr(tydesc_type)],
                 T_ptr(tydesc_type)),
+          free_shared_type_desc:
+              dv("free_shared_type_desc", [T_ptr(tydesc_type)]),
           get_type_desc:
               d("get_type_desc",
                 [T_ptr(T_nil()), size_t,

trunk/src/comp/middle/shape.rs

@@ -51,6 +51,7 @@ const shape_obj: u8 = 19u8;
 const shape_res: u8 = 20u8;
 const shape_var: u8 = 21u8;
 const shape_uniq: u8 = 22u8;
+const shape_opaque_closure: u8 = 23u8; // the closure itself.
 
 // FIXME: This is a bad API in trans_common.
 fn C_u8(n: u8) -> ValueRef { ret trans_common::C_u8(n as uint); }
@@ -384,9 +385,6 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint],
         }
         add_substr(s, sub);
       }
-      ty::ty_fn(_, _, _, _, _) {
-        s += [shape_fn];
-      }
       ty::ty_native_fn(_, _) { s += [shape_u32]; }
       ty::ty_obj(_) { s += [shape_obj]; }
       ty::ty_res(did, raw_subt, tps) {
@@ -412,19 +410,18 @@ fn shape_of(ccx: @crate_ctxt, t: ty::t, ty_param_map: [uint],
             s += [shape_var, n as u8];
         } else {
             // Find the type parameter in the parameter list.
-            let found = false;
-            let i = 0u;
-            while i < vec::len(ty_param_map) {
-                if n == ty_param_map[i] {
-                    s += [shape_var, i as u8];
-                    found = true;
-                    break;
-                }
-                i += 1u;
+            alt vec::position(n, ty_param_map) {
+              some(i) { s += [shape_var, i as u8]; }
+              none. { fail "ty param not found in ty_param_map"; }
             }
-            assert (found);
         }
       }
+      ty::ty_fn(_, _, _, _, _) {
+        s += [shape_fn];
+      }
+      ty::ty_opaque_closure. {
+        s += [shape_opaque_closure];
+      }
     }
 
     ret s;