@@ -2730,7 +2730,7 @@ fn trans_call_inner(in_cx: block, fn_expr_ty: ty::t, ret_ty: ty::t,
2730
2730
then one or more of the args has
2731
2731
type _|_. Since that means it diverges, the code
2732
2732
for the call itself is unreachable. */
2733
- bcx = invoke_full ( bcx, faddr, llargs) ;
2733
+ bcx = invoke ( bcx, faddr, llargs) ;
2734
2734
alt dest {
2735
2735
ignore {
2736
2736
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,
2759
2759
}
2760
2760
}
2761
2761
2762
- fn invoke ( bcx : block , llfn : ValueRef ,
2763
- llargs : [ ValueRef ] ) -> block {
2764
- ret invoke_ ( bcx, llfn, llargs, Invoke ) ;
2765
- }
2766
-
2767
- fn invoke_full ( bcx : block , llfn : ValueRef , llargs : [ ValueRef ] )
2768
- -> block {
2769
- ret invoke_ ( bcx, llfn, llargs, Invoke ) ;
2770
- }
2771
-
2772
- fn invoke_ ( bcx : block , llfn : ValueRef , llargs : [ ValueRef ] ,
2773
- invoker : fn ( block , ValueRef , [ ValueRef ] ,
2774
- BasicBlockRef , BasicBlockRef ) ) -> block {
2762
+ fn invoke ( bcx : block , llfn : ValueRef , llargs : [ ValueRef ] ) -> block {
2775
2763
let _icx = bcx. insn_ctxt ( "invoke_" ) ;
2776
2764
// FIXME: May be worth turning this into a plain call when there are no
2777
2765
// cleanups to run
2778
2766
if bcx. unreachable { ret bcx; }
2779
2767
let normal_bcx = sub_block ( bcx, "normal return" ) ;
2780
- /*io::println("fn: " + lib::llvm::type_to_str(bcx.ccx().tn,
2781
- val_ty(llfn)));
2782
- for a in llargs {
2783
- io::println(" a: " + lib::llvm::type_to_str(bcx.ccx().tn,
2784
- val_ty(a)));
2785
- }*/
2786
- invoker ( bcx, llfn, llargs, normal_bcx. llbb , get_landing_pad ( bcx) ) ;
2768
+ Invoke ( bcx, llfn, llargs, normal_bcx. llbb , get_landing_pad ( bcx) ) ;
2787
2769
ret normal_bcx;
2788
2770
}
2789
2771
0 commit comments