---

yaml
---
r: 57635
b: refs/heads/incoming
c: f93b3cd
h: refs/heads/master
i:
  57633: 3a60fa0
  57631: ccb03b5
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: af4ea11d09618b800ebec477333a373a75a46d96
+refs/heads/incoming: f93b3cd5c3783eabd527607adda891d8a84dab4f
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/cabi.rs

@@ -13,7 +13,6 @@ use middle::trans::base::*;
 use middle::trans::build::*;
 use middle::trans::common::*;
 
-use core::io::println;
 use core::libc::c_uint;
 use core::option;
 use core::vec;

branches/incoming/src/librustc/middle/trans/foreign.rs

@@ -185,17 +185,19 @@ fn build_wrap_fn_(ccx: @CrateContext,
                   llshimfn: ValueRef,
                   llwrapfn: ValueRef,
                   shim_upcall: ValueRef,
+                  needs_c_return: bool,
                   arg_builder: wrap_arg_builder,
                   ret_builder: wrap_ret_builder) {
     let _icx = ccx.insn_ctxt("foreign::build_wrap_fn_");
     let fcx = new_fn_ctxt(ccx, ~[], llwrapfn, tys.fn_sig.output, None);
 
-    // Patch up the return type if it's not immediate.
-    /*if !ty::type_is_immediate(tys.fn_sig.output) {
+    // Patch up the return type if it's not immediate and we're returning via
+    // the C ABI.
+    if needs_c_return && !ty::type_is_immediate(tys.fn_sig.output) {
         let lloutputtype = type_of::type_of(*fcx.ccx, tys.fn_sig.output);
         fcx.llretptr = Some(alloca(raw_block(fcx, false, fcx.llstaticallocas),
                                    lloutputtype));
-    }*/
+    }
 
     let bcx = top_scope_block(fcx, None);
     let lltop = bcx.llbb;
@@ -499,6 +501,7 @@ pub fn trans_foreign_mod(ccx: @CrateContext,
                        llshimfn,
                        llwrapfn,
                        ccx.upcalls.call_shim_on_c_stack,
+                       false,
                        build_args,
                        build_ret);
 
@@ -1229,6 +1232,7 @@ pub fn trans_foreign_fn(ccx: @CrateContext,
                        llshimfn,
                        llwrapfn,
                        ccx.upcalls.call_shim_on_rust_stack,
+                       true,
                        build_args,
                        build_ret);
 

branches/incoming/src/test/bench/shootout-reverse-complement.rs

@@ -1,3 +1,5 @@
+// xfail-pretty
+
 use core::cast::transmute;
 use core::libc::{STDOUT_FILENO, c_int, fdopen, fgets, fopen, fputc, fwrite};
 use core::libc::{size_t};