diff --git a/src/librustc_trans/trans/_match.rs b/src/librustc_trans/trans/_match.rs
index af0780587e8b0..70940345e97d4 100644
--- a/src/librustc_trans/trans/_match.rs
+++ b/src/librustc_trans/trans/_match.rs
@@ -1283,6 +1283,10 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
     let exhaustive = chk.is_infallible() && defaults.is_empty();
     let len = opts.len();
 
+    if exhaustive && kind == Switch {
+        build::Unreachable(else_cx);
+    }
+
     // Compile subtrees for each option
     for (i, opt) in opts.iter().enumerate() {
         // In some cases of range and vector pattern matching, we need to
@@ -1293,7 +1297,7 @@ fn compile_submatch_continue<'a, 'p, 'blk, 'tcx>(mut bcx: Block<'blk, 'tcx>,
         let mut opt_cx = else_cx;
         let debug_loc = opt.debug_loc();
 
-        if !exhaustive || i + 1 < len {
+        if kind == Switch || !exhaustive || i + 1 < len {
             opt_cx = bcx.fcx.new_temp_block("match_case");
             match kind {
                 Single => Br(bcx, opt_cx.llbb, debug_loc),
diff --git a/src/test/codegen/match.rs b/src/test/codegen/match.rs
new file mode 100644
index 0000000000000..ac47f6082e3e3
--- /dev/null
+++ b/src/test/codegen/match.rs
@@ -0,0 +1,30 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-flags: -C no-prepopulate-passes
+
+#![crate_type = "lib"]
+
+pub enum E {
+    A,
+    B,
+}
+
+// CHECK-LABEL: @exhaustive_match
+#[no_mangle]
+pub fn exhaustive_match(e: E) {
+// CHECK: switch{{.*}}, label %[[DEFAULT:[a-zA-Z0-9_]+]]
+// CHECK: [[DEFAULT]]:
+// CHECK-NEXT: unreachable
+    match e {
+        E::A => (),
+        E::B => (),
+    }
+}