Reuse cleanup pad declared at start of block.

diff --git a/src/librustc_trans/cleanup.rs b/src/librustc_trans/cleanup.rs
index 9409ac5f8e1c76623284eba44dc1e5fe29f0043b..add820748acfcd5325107a8292a73e5d9b3671d2 100644 (file)
--- a/src/librustc_trans/cleanup.rs
+++ b/src/librustc_trans/cleanup.rs
@@ -59,11 +59,11 @@ fn get_landing_pad<'a>(&self, fcx: &FunctionContext<'a, 'tcx>) -> BasicBlockRef
         bcx.set_personality_fn(llpersonality);
 
         if base::wants_msvc_seh(fcx.ccx.sess()) {
-            // Insert cleanup instructions into the cleanup block
-            let funclet = Some(Funclet::new(bcx.cleanup_pad(None, &[])));
+            let pad = bcx.cleanup_pad(None, &[]);
+            let funclet = Some(Funclet::new(pad));
             self.trans(funclet.as_ref(), &bcx);
 
-            bcx.cleanup_ret(bcx.cleanup_pad(None, &[]), None);
+            bcx.cleanup_ret(pad, None);
         } else {
             // The landing pad return type (the type being propagated). Not sure
             // what this represents but it's determined by the personality