---

yaml
---
r: 139038
b: refs/heads/try2
c: 9ead7da
h: refs/heads/master
v: v3

Author: luqmana

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 59dcbd9f1c04a670cb12e1127a2f1fd0898050a6
+refs/heads/try2: 9ead7dad934cc361f8e5e489238031c987ecfc82
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/expr.rs

@@ -561,17 +561,32 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
                              clobs, volatile, alignstack) => {
             let mut constraints = ~[];
             let mut cleanups = ~[];
+            let mut aoutputs = ~[];
 
             let outputs = do outs.map |&(c, out)| {
                 constraints.push(copy *c);
 
-                let outty = ty::arg {
+                let aoutty = ty::arg {
                     mode: ast::expl(ast::by_val),
                     ty: expr_ty(bcx, out)
                 };
+                aoutputs.push(unpack_result!(bcx, {
+                    callee::trans_arg_expr(bcx, aoutty, out, &mut cleanups,
+                                           None, callee::DontAutorefArg)
+                    }));
+
+                let e = match out.node {
+                    ast::expr_addr_of(_, e) => e,
+                    _ => fail!(~"Expression must be addr of")
+                };
+
+                let outty = ty::arg {
+                    mode: ast::expl(ast::by_val),
+                    ty: expr_ty(bcx, e)
+                };
 
                 unpack_result!(bcx, {
-                    callee::trans_arg_expr(bcx, outty, out, &mut cleanups,
+                    callee::trans_arg_expr(bcx, outty, e, &mut cleanups,
                                            None, callee::DontAutorefArg)
                 })
 
@@ -627,7 +642,7 @@ fn trans_rvalue_stmt_unadjusted(bcx: block, expr: @ast::expr) -> block {
             };
 
             // TODO: Handle >1 outputs
-            let op = PointerCast(bcx, output, T_ptr(val_ty(output)));
+            let op = PointerCast(bcx, aoutputs[0], T_ptr(val_ty(output)));
             Store(bcx, r, op);
 
             return bcx;

branches/try2/src/libsyntax/ext/asm.rs

@@ -75,6 +75,13 @@ pub fn expand_asm(cx: @ext_ctxt, sp: span, tts: &[ast::token_tree])
                     let out = p.parse_expr();
                     p.expect(&token::RPAREN);
 
+                    let out = @ast::expr {
+                        id: cx.next_id(),
+                        callee_id: cx.next_id(),
+                        span: out.span,
+                        node: ast::expr_addr_of(ast::m_mutbl, out)
+                    };
+
                     outputs.push((constraint, out));
                 }
             }