From 51468b65a48e7e897ff7ac080c33efb7b5ce289d Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Tue, 26 Jun 2012 12:47:06 -0700
Subject: [PATCH] Properly cleanup slice literals. Closes #2705.

---
 src/rustc/middle/trans/tvec.rs      |  7 +++++++
 src/test/run-pass/vec-slice-drop.rs | 15 +++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 src/test/run-pass/vec-slice-drop.rs

diff --git a/src/rustc/middle/trans/tvec.rs b/src/rustc/middle/trans/tvec.rs
index 4a471bd0059..58d415ad266 100644
--- a/src/rustc/middle/trans/tvec.rs
+++ b/src/rustc/middle/trans/tvec.rs
@@ -152,8 +152,15 @@ fn trans_evec(bcx: block, args: [@ast::expr]/~,
           }
           ast::vstore_slice(_) {
             let n = vec::len(args);
+            // Make a fake type to use for the cleanup
+            let ty = ty::mk_evec(bcx.tcx(),
+                                 {ty: unit_ty, mutbl: ast::m_mutbl},
+                                 ty::vstore_fixed(n));
+
             let n = C_uint(ccx, n);
             let vp = base::arrayalloca(bcx, llunitty, n);
+            add_clean(bcx, vp, ty);
+
             let len = Mul(bcx, n, unit_sz);
 
             let p = base::alloca(bcx, T_struct([T_ptr(llunitty),
diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/run-pass/vec-slice-drop.rs
new file mode 100644
index 00000000000..e8709d8f108
--- /dev/null
+++ b/src/test/run-pass/vec-slice-drop.rs
@@ -0,0 +1,15 @@
+// Make sure that destructors get run on slice literals
+class foo {
+    let x: @mut int;
+    new(x: @mut int) { self.x = x; }
+    drop { *self.x += 1; }
+}
+
+fn main() {
+    let x = @mut 0;
+    {
+        let l = [foo(x)]/&;
+        assert *l[0].x == 0;
+    }
+    assert *x == 1;
+}