From 0e5f76a718277cd31098af9f90cd5e0a0a68b4b1 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 22 Sep 2011 18:14:18 -0700
Subject: [PATCH] Fix ty_uniq case in maybe_auto_unbox

Closes #961
Issue #409
---
 src/comp/middle/mut.rs                  | 1 +
 src/test/run-pass/unique-alt-discrim.rs | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 src/test/run-pass/unique-alt-discrim.rs

diff --git a/src/comp/middle/mut.rs b/src/comp/middle/mut.rs
index 802fbbe7e402..2866d71e0044 100644
--- a/src/comp/middle/mut.rs
+++ b/src/comp/middle/mut.rs
@@ -24,6 +24,7 @@ fn expr_root(tcx: ty::ctxt, ex: @expr, autoderef: bool) ->
               }
               ty::ty_uniq(mt) {
                 ds += [@{mut: mt.mut != imm, kind: unbox, outer_t: t}];
+                t = mt.ty;
               }
               ty::ty_res(_, inner, tps) {
                 ds += [@{mut: false, kind: unbox, outer_t: t}];
diff --git a/src/test/run-pass/unique-alt-discrim.rs b/src/test/run-pass/unique-alt-discrim.rs
new file mode 100644
index 000000000000..ad9b6ed2ce81
--- /dev/null
+++ b/src/test/run-pass/unique-alt-discrim.rs
@@ -0,0 +1,8 @@
+// Issue #961
+
+fn altsimple() {
+    alt ~true {
+      _ { }
+    }
+}
+fn main() { }
\ No newline at end of file