---

pnkfelix · pnkfelix · commit c0877c002001 · 2015-04-27T16:08:30.000+02:00
yaml --- r: 216303 b: refs/heads/stable c: 24f213d h: refs/heads/master i: 216301: c9b4355 216299: 7330b36 216295: 50cf831 216287: b618660 v: v3
diff --git a/[refs] b/[refs]
@@ -29,5 +29,5 @@ refs/heads/tmp: 378a370ff2057afeb1eae86eb6e78c476866a4a6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: a5286998df566e736b32f6795bfc3803bdaf453d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: b0a4808757fda7ae4d047e570f0936b969eb6e42
+refs/heads/stable: 24f213d0231c04c2bde1ca65bb5dc93df7c4aaa7
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
diff --git a/branches/stable/src/librustc_trans/trans/_match.rs b/branches/stable/src/librustc_trans/trans/_match.rs
@@ -916,8 +916,8 @@ fn insert_lllocals<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
 
         let datum = Datum::new(llval, binding_info.ty, Lvalue);
         if let Some(cs) = cs {
-            bcx.fcx.schedule_drop_and_fill_mem(cs, llval, binding_info.ty);
             bcx.fcx.schedule_lifetime_end(cs, binding_info.llmatch);
+            bcx.fcx.schedule_drop_and_fill_mem(cs, llval, binding_info.ty);
         }
 
         debug!("binding {} to {}", binding_info.id, bcx.val_to_string(llval));

Original file line number	Diff line number	Diff line change
`@@ -916,8 +916,8 @@ fn insert_lllocals<'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,`
`916`	`916`
`917`	`917`	`let datum = Datum::new(llval, binding_info.ty, Lvalue);`
`918`	`918`	`if let Some(cs) = cs {`
`919`		`- bcx.fcx.schedule_drop_and_fill_mem(cs, llval, binding_info.ty);`
`920`	`919`	`bcx.fcx.schedule_lifetime_end(cs, binding_info.llmatch);`
	`920`	`+ bcx.fcx.schedule_drop_and_fill_mem(cs, llval, binding_info.ty);`
`921`	`921`	`}`
`922`	`922`
`923`	`923`	`debug!("binding {} to {}", binding_info.id, bcx.val_to_string(llval));`