---

yaml
---
r: 5489
b: refs/heads/master
c: 572a4b7
h: refs/heads/master
i:
  5487: f96a61a
v: v3

Author: marijnh

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64c69aa7b88b3ef66167f26cf681aaeeed33180e
+refs/heads/master: 572a4b71d5a906ab25a30025fc87529f123ee020

trunk/src/comp/middle/trans.rs

@@ -2455,7 +2455,7 @@ fn join_returns(parent_cx: @block_ctxt, in_cxs: [@block_ctxt],
                 if option::is_none(phi) {
                     phi = some(EmptyPhi(out, val_ty(*cell)));
                 }
-                AddIncomingToPhi(option::get(phi), [*cell], [cx.llbb]);
+                AddIncomingToPhi(option::get(phi), *cell, cx.llbb);
               }
               _ {}
             }

trunk/src/comp/middle/trans_build.rs

@@ -465,13 +465,11 @@ fn Phi(cx: @block_ctxt, Ty: TypeRef, vals: [ValueRef], bbs: [BasicBlockRef])
     ret phi;
 }
 
-// FIXME we typically need only a single val and bb. With std::ptr::addr_of
-// and a count of 1, we should be able to avoid the overhead of creating vecs.
-fn AddIncomingToPhi(phi: ValueRef, vals: [ValueRef], bbs: [BasicBlockRef]) {
+fn AddIncomingToPhi(phi: ValueRef, val: ValueRef, bb: BasicBlockRef) {
     if llvm::LLVMIsUndef(phi) == lib::llvm::True { ret; }
-    assert (vec::len::<ValueRef>(vals) == vec::len::<BasicBlockRef>(bbs));
-    llvm::LLVMAddIncoming(phi, vec::to_ptr(vals), vec::to_ptr(bbs),
-                          vec::len(vals));
+    let valptr = std::unsafe::reinterpret_cast(std::ptr::addr_of(val));
+    let bbptr = std::unsafe::reinterpret_cast(std::ptr::addr_of(bb));
+    llvm::LLVMAddIncoming(phi, valptr, bbptr, 1u);
 }
 
 fn _UndefReturn(Fn: ValueRef) -> ValueRef {

trunk/src/comp/middle/trans_vec.rs

@@ -289,8 +289,8 @@ fn iter_vec_raw(bcx: @block_ctxt, vptrptr: ValueRef, vec_ty: ty::t,
         if ty::type_has_dynamic_size(bcx_tcx(bcx), unit_ty) {
             unit_sz
         } else { C_int(1) };
-    AddIncomingToPhi(data_ptr, [InBoundsGEP(body_cx, data_ptr, [increment])],
-                     [body_cx.llbb]);
+    AddIncomingToPhi(data_ptr, InBoundsGEP(body_cx, data_ptr, [increment]),
+                     body_cx.llbb);
     Br(body_cx, header_cx.llbb);
     ret next_cx;
 }