---

yaml
---
r: 21367
b: refs/heads/snap-stage3
c: 0dad78e
h: refs/heads/master
i:
  21365: eab1c94
  21363: e1c1256
  21359: 0e5f52c
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 18180fd5dac16582474b5ec0fd49ebb03f7f939d
+refs/heads/snap-stage3: 0dad78e03d411a5bae4a7aa20eda93231634a095
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/llvm

@@ -1 +1 @@
-Subproject commit b55be285d18e9b3537fc9d29af44e83be2171326
+Subproject commit ab9efdacc290b24955561eda222363217578a908

branches/snap-stage3/src/rustc/driver/session.rs

@@ -189,7 +189,7 @@ impl session {
     }
     // This exists to help with refactoring to eliminate impossible
     // cases later on
-    fn impossible_case(sp: span, msg: ~str) -> ! {
+    fn impossible_case(sp: span, msg: &str) -> ! {
         self.span_bug(sp, #fmt("Impossible case reached: %s", msg));
     }
     fn ppregions() -> bool { self.debugging_opt(ppregions) }

branches/snap-stage3/src/rustc/middle/trans/alt.rs

@@ -305,10 +305,10 @@ fn extract_variant_args(bcx: block, pat_id: ast::node_id,
    {vals: ~[ValueRef], bcx: block} {
     let _icx = bcx.insn_ctxt("alt::extract_variant_args");
     let ccx = bcx.fcx.ccx;
-    let enum_ty_substs = match check ty::get(node_id_type(bcx, pat_id))
+    let enum_ty_substs = match ty::get(node_id_type(bcx, pat_id))
         .struct {
-
       ty::ty_enum(id, substs) => { assert id == vdefs.enm; substs.tps }
+      _ => bcx.sess().bug(~"extract_variant_args: pattern has non-enum type")
     };
     let mut blobptr = val;
     let variants = ty::enum_variants(ccx.tcx, vdefs.enm);
@@ -667,11 +667,13 @@ fn compile_submatch(bcx: block, m: match_, vals: ~[ValueRef],
             match kind {
               single => Br(bcx, opt_cx.llbb),
               switch => {
-                match check trans_opt(bcx, opt) {
+                match trans_opt(bcx, opt) {
                   single_result(r) => {
                     llvm::LLVMAddCase(sw, r.val, opt_cx.llbb);
                     bcx = r.bcx;
                   }
+                  _ => bcx.sess().bug(~"in compile_submatch, expected \
+                         trans_opt to return a single_result")
                 }
               }
               compare => {
@@ -892,7 +894,8 @@ fn trans_alt_inner(scope_cx: block, expr: @ast::expr, arms: ~[ast::arm],
                 let arm_dest = dup_for_join(dest);
                 vec::push(arm_dests, arm_dest);
                 let mut arm_cx = trans_block(body_cx, a.body, arm_dest);
-                arm_cx = trans_block_cleanups(arm_cx, body_cx);
+                arm_cx = trans_block_cleanups(arm_cx,
+                                              block_cleanups(body_cx));
                 vec::push(arm_cxs, arm_cx);
             }
         }