---

yaml
---
r: 272707
b: refs/heads/beta
c: 356bf52
h: refs/heads/master
i:
  272705: a0319fb
  272703: c775b32

Author: nagisa

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 77be4ecc1795787eab4b51b9def35096546122ec
+refs/heads/beta: 356bf529eedaea523b4266057b2ce8a13435b737
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/test/run-fail/mir_dynamic_drops_1.rs

@@ -14,22 +14,23 @@ use std::io::{self, Write};
 
 
 /// Structure which will not allow to be dropped twice.
-struct Droppable(bool, u32);
-impl Drop for Droppable {
+struct Droppable<'a>(&'a mut bool, u32);
+impl<'a> Drop for Droppable<'a> {
     fn drop(&mut self) {
-        if self.0 {
+        if *self.0 {
             writeln!(io::stderr(), "{} dropped twice", self.1);
             ::std::process::exit(1);
         }
         writeln!(io::stderr(), "drop {}", self.1);
-        self.0 = true;
+        *self.0 = true;
     }
 }
 
 #[rustc_mir]
 fn mir(){
-    let x = Droppable(false, 1);
-    let y = Droppable(false, 2);
+    let (mut xv, mut yv) = (false, false);
+    let x = Droppable(&mut xv, 1);
+    let y = Droppable(&mut yv, 2);
     let mut z = x;
     let k = y;
     z = k;

branches/beta/src/test/run-fail/mir_dynamic_drops_2.rs

@@ -13,27 +13,28 @@ use std::io::{self, Write};
 
 
 /// Structure which will not allow to be dropped twice.
-struct Droppable(bool, u32);
-impl Drop for Droppable {
+struct Droppable<'a>(&'a mut bool, u32);
+impl<'a> Drop for Droppable<'a> {
     fn drop(&mut self) {
-        if self.0 {
+        if *self.0 {
             writeln!(io::stderr(), "{} dropped twice", self.1);
             ::std::process::exit(1);
         }
         writeln!(io::stderr(), "drop {}", self.1);
-        self.0 = true;
+        *self.0 = true;
     }
 }
 
 #[rustc_mir]
-fn mir(d: Droppable){
+fn mir<'a>(d: Droppable<'a>){
     loop {
         let x = d;
         break;
     }
 }
 
 fn main() {
-    mir(Droppable(false, 1));
+    let mut xv = false;
+    mir(Droppable(&mut xv, 1));
     panic!();
 }

branches/beta/src/test/run-fail/mir_dynamic_drops_3.rs

@@ -16,28 +16,30 @@ use std::io::{self, Write};
 
 
 /// Structure which will not allow to be dropped twice.
-struct Droppable(bool, u32);
-impl Drop for Droppable {
+struct Droppable<'a>(&'a mut bool, u32);
+impl<'a> Drop for Droppable<'a> {
     fn drop(&mut self) {
-        if self.0 {
+        if *self.0 {
             writeln!(io::stderr(), "{} dropped twice", self.1);
             ::std::process::exit(1);
         }
         writeln!(io::stderr(), "drop {}", self.1);
-        self.0 = true;
+        *self.0 = true;
     }
 }
 
-fn may_panic() -> Droppable {
+fn may_panic<'a>() -> Droppable<'a> {
     panic!("unwind happens");
 }
 
 #[rustc_mir]
-fn mir(d: Droppable){
-    let y = Droppable(false, 2);
-    let x = [Droppable(false, 1), y, d, may_panic()];
+fn mir<'a>(d: Droppable<'a>){
+    let (mut a, mut b) = (false, false);
+    let y = Droppable(&mut a, 2);
+    let x = [Droppable(&mut b, 1), y, d, may_panic()];
 }
 
 fn main() {
-    mir(Droppable(false, 3));
+    let mut c = false;
+    mir(Droppable(&mut c, 3));
 }