---

yaml
---
r: 1571
b: refs/heads/master
c: 02f669c
h: refs/heads/master
i:
  1569: 3c31696
  1567: 7a0063b
v: v3

Author: cixtor

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10d8b4e861faedb734636a80dc4963392f1f82c5
+refs/heads/master: 02f669ca6759f94deb87fb8dc3303eb08544c5a0

trunk/src/comp/middle/trans.rs

@@ -832,7 +832,7 @@ fn decl_upcall_glue(ModuleRef llmod, type_names tn, uint _n) -> ValueRef {
     let str s = abi.upcall_glue_name(n);
     let vec[TypeRef] args =
         vec(T_int(),     // callee
-            T_taskptr(tn)) // taskptr
+            T_int()) // taskptr
         + _vec.init_elt[TypeRef](T_int(), n as uint);
 
     ret decl_fastcall_fn(llmod, s, T_fn(args, T_int()));
@@ -856,7 +856,8 @@ fn trans_upcall(@block_ctxt cx, str name, vec[ValueRef] args) -> result {
     llupcall = llvm.LLVMConstPointerCast(llupcall, T_int());
 
     let ValueRef llglue = cx.fcx.ccx.glues.upcall_glues.(n);
-    let vec[ValueRef] call_args = vec(llupcall, cx.fcx.lltaskptr);
+    let vec[ValueRef] call_args = vec(llupcall);
+    call_args += cx.build.PtrToInt(cx.fcx.lltaskptr, T_int());
 
     for (ValueRef a in args) {
         call_args += cx.build.ZExtOrBitCast(a, T_int());