From 654131cb5376514eb355f40837790afca7fa3e7d Mon Sep 17 00:00:00 2001
From: Mark Simulacrum <mark.simulacrum@gmail.com>
Date: Mon, 19 Dec 2016 20:09:51 -0700
Subject: [PATCH] Add unreachable() after calls to eh_unwind_resume.

---
 src/librustc_trans/cleanup.rs   | 1 +
 src/librustc_trans/mir/block.rs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/librustc_trans/cleanup.rs b/src/librustc_trans/cleanup.rs
index 21eccb101f73..5bf8aecf6673 100644
--- a/src/librustc_trans/cleanup.rs
+++ b/src/librustc_trans/cleanup.rs
@@ -93,6 +93,7 @@ impl<'tcx> DropValue<'tcx> {
             } else {
                 let exc_ptr = resume_bcx.extract_value(lp, 0);
                 resume_bcx.call(fcx.eh_unwind_resume().reify(fcx.ccx), &[exc_ptr], None);
+                resume_bcx.unreachable();
             }
             UnwindKind::LandingPad
         };
diff --git a/src/librustc_trans/mir/block.rs b/src/librustc_trans/mir/block.rs
index 2b408e3170ee..e665c7a2307f 100644
--- a/src/librustc_trans/mir/block.rs
+++ b/src/librustc_trans/mir/block.rs
@@ -130,6 +130,7 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
                             &[exc_ptr],
                             cleanup_bundle,
                         );
+                        bcx.unreachable();
                     }
                 }
             }