---

yaml
---
r: 10740
b: refs/heads/snap-stage3
c: 51468b6
h: refs/heads/master
v: v3

Author: msullivan

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: f17ca3f73e8e6196a7549ae0df721828a3dfd262
+refs/heads/snap-stage3: 51468b65a48e7e897ff7ac080c33efb7b5ce289d
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/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),

branches/snap-stage3/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;
+}