---

yaml
---
r: 12217
b: refs/heads/master
c: 8780db2
h: refs/heads/master
i:
  12215: 92a5dbf
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b420f46f0309ff9fe681fc7f6b4d5412ab40a439
+refs/heads/master: 8780db2e0bc40aff2c030962c9fc3dd299a678fa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

@@ -2730,7 +2730,7 @@ fn trans_call_inner(in_cx: block, fn_expr_ty: ty::t, ret_ty: ty::t,
         then one or more of the args has
         type _|_. Since that means it diverges, the code
         for the call itself is unreachable. */
-        bcx = invoke_full(bcx, faddr, llargs);
+        bcx = invoke(bcx, faddr, llargs);
         alt dest {
           ignore {
             if llvm::LLVMIsUndef(llretslot) != lib::llvm::True {
@@ -2759,31 +2759,13 @@ fn trans_call_inner(in_cx: block, fn_expr_ty: ty::t, ret_ty: ty::t,
     }
 }
 
-fn invoke(bcx: block, llfn: ValueRef,
-          llargs: [ValueRef]) -> block {
-    ret invoke_(bcx, llfn, llargs, Invoke);
-}
-
-fn invoke_full(bcx: block, llfn: ValueRef, llargs: [ValueRef])
-    -> block {
-    ret invoke_(bcx, llfn, llargs, Invoke);
-}
-
-fn invoke_(bcx: block, llfn: ValueRef, llargs: [ValueRef],
-           invoker: fn(block, ValueRef, [ValueRef],
-                       BasicBlockRef, BasicBlockRef)) -> block {
+fn invoke(bcx: block, llfn: ValueRef, llargs: [ValueRef]) -> block {
     let _icx = bcx.insn_ctxt("invoke_");
     // FIXME: May be worth turning this into a plain call when there are no
     // cleanups to run
     if bcx.unreachable { ret bcx; }
     let normal_bcx = sub_block(bcx, "normal return");
-    /*io::println("fn: " + lib::llvm::type_to_str(bcx.ccx().tn,
-                                                val_ty(llfn)));
-    for a in llargs {
-        io::println(" a: " + lib::llvm::type_to_str(bcx.ccx().tn,
-                                                    val_ty(a)));
-    }*/
-    invoker(bcx, llfn, llargs, normal_bcx.llbb, get_landing_pad(bcx));
+    Invoke(bcx, llfn, llargs, normal_bcx.llbb, get_landing_pad(bcx));
     ret normal_bcx;
 }