---

yaml
---
r: 32535
b: refs/heads/dist-snap
c: 4a86540
h: refs/heads/master
i:
  32533: 4361d07
  32531: ab8236c
  32527: 26c582b
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 23880daef2fbdfc01f8651fa8e84eb9700cceb3c
+refs/heads/dist-snap: 4a865401f580863c67b9dd0e44a0192f21817c7c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/back/upcall.rs

@@ -8,16 +8,12 @@ use middle::trans::common::{T_fn, T_i1, T_i8, T_i32,
 use lib::llvm::{type_names, ModuleRef, ValueRef, TypeRef};
 
 type upcalls =
-    {_fail: ValueRef,
-     trace: ValueRef,
+    {trace: ValueRef,
      malloc: ValueRef,
      free: ValueRef,
      exchange_malloc: ValueRef,
      exchange_free: ValueRef,
      validate_box: ValueRef,
-     mark: ValueRef,
-     str_new_uniq: ValueRef,
-     str_new_shared: ValueRef,
      log_type: ValueRef,
      call_shim_on_c_stack: ValueRef,
      call_shim_on_rust_stack: ValueRef,
@@ -45,10 +41,7 @@ fn declare_upcalls(targ_cfg: @session::config,
     let int_t = T_int(targ_cfg);
     let size_t = T_size_t(targ_cfg);
 
-    return @{_fail: dv(~"fail", ~[T_ptr(T_i8()),
-                             T_ptr(T_i8()),
-                             size_t]),
-          trace: dv(~"trace", ~[T_ptr(T_i8()),
+    return @{trace: dv(~"trace", ~[T_ptr(T_i8()),
                               T_ptr(T_i8()),
                               int_t]),
           malloc:
@@ -65,14 +58,6 @@ fn declare_upcalls(targ_cfg: @session::config,
               nothrow(dv(~"exchange_free", ~[T_ptr(T_i8())])),
           validate_box:
               nothrow(dv(~"validate_box", ~[T_ptr(T_i8())])),
-          mark:
-              d(~"mark", ~[T_ptr(T_i8())], int_t),
-          str_new_uniq:
-              nothrow(d(~"str_new_uniq", ~[T_ptr(T_i8()), int_t],
-                        T_ptr(T_i8()))),
-          str_new_shared:
-              nothrow(d(~"str_new_shared", ~[T_ptr(T_i8()), int_t],
-                        T_ptr(T_i8()))),
           log_type:
               dv(~"log_type", ~[T_ptr(tydesc_type),
                               T_ptr(T_i8()), T_i32()]),