---

yaml
---
r: 5637
b: refs/heads/master
c: dcf0e80
h: refs/heads/master
i:
  5635: bf63db6
v: v3

Author: pcwalton

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 472dd71fea8d1bb99e3c896d149323ab88cc1344
+refs/heads/master: dcf0e807fbc46142859d0b0b0de0bfba4edce4c8

trunk/src/comp/middle/trans.rs

@@ -4029,7 +4029,15 @@ fn trans_c_stack_native_call(bcx: @block_ctxt, f: @ast::expr,
     let ret_ty = ty::ty_fn_ret(bcx_tcx(bcx), fn_ty);
     check type_has_static_size(ccx, ret_ty);
     let llretty = type_of(ccx, f.span, ret_ty);
-    let llretval = TruncOrBitCast(bcx, llrawretval, llretty);
+    log_err "casting " + val_str(ccx.tn, llrawretval) + " to " +
+        lib::llvm::type_to_str(ccx.tn, llretty);
+
+    let llretval;
+    if lib::llvm::llvm::LLVMGetTypeKind(llretty) as int == 11 { // pointer
+        llretval = IntToPtr(bcx, llrawretval, llretty);
+    } else {
+        llretval = TruncOrBitCast(bcx, llrawretval, llretty);
+    }
 
     // Forget about anything we moved out.
     bcx = zero_and_revoke(bcx, to_zero, to_revoke);