---

yaml
---
r: 30075
b: refs/heads/incoming
c: 0dad78e
h: refs/heads/master
i:
  30073: 959776d
  30071: ab03888
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 18180fd5dac16582474b5ec0fd49ebb03f7f939d
+refs/heads/incoming: 0dad78e03d411a5bae4a7aa20eda93231634a095
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/llvm

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

branches/incoming/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/incoming/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);
             }
         }