---

yaml
---
r: 5907
b: refs/heads/master
c: 80102c9
h: refs/heads/master
i:
  5905: bd88d53
  5903: 577b024
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ab6315f5fe51e9620e48fa4118d44b780e1c828
+refs/heads/master: 80102c9d241538a8ec61d2da3db15b63de1ce8d7

trunk/src/comp/middle/trans.rs

@@ -3848,8 +3848,7 @@ fn trans_c_stack_native_call(bcx: @block_ctxt, f: @ast::expr,
 
         let r = trans_arg_expr(bcx, ty_arg, llargty, to_zero, to_revoke, arg);
         let llargval = r.val; bcx = r.bcx;
-        { llval: llargval, llty: llargty, static: static,
-          by_val: ty_arg.mode == ast::by_val }
+        { llval: llargval, llty: llargty, static: static, mode: ty_arg.mode }
     }, fn_arg_tys, args);
 
     // Allocate the argument bundle.
@@ -3865,7 +3864,10 @@ fn trans_c_stack_native_call(bcx: @block_ctxt, f: @ast::expr,
         if llarg.static {
             // FIXME: This load is unfortunate. It won't be necessary once we
             // have reference types again.
-            llargval = llarg.by_val ? llarg.llval : Load(bcx, llarg.llval);
+            llargval = alt llarg.mode {
+              ast::by_val. | ast::by_mut_ref. { llarg.llval }
+              ast::by_ref. | ast::mode_infer. { Load(bcx, llarg.llval) }
+            };
         } else {
             llargval = llarg.llval;
         }

trunk/src/comp/middle/trans_build.rs

@@ -3,7 +3,8 @@ import std::str::sbuf;
 import lib::llvm::llvm;
 import llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, Opcode,
               ModuleRef};
-import trans_common::{block_ctxt, T_ptr, T_nil, T_int, T_i8, T_i1, val_ty};
+import trans_common::{block_ctxt, T_ptr, T_nil, T_int, T_i8, T_i1,
+                      val_ty, val_str, bcx_ccx};
 
 fn B(cx: @block_ctxt) -> BuilderRef {
     let b = *cx.fcx.lcx.ccx.builder;