--- a/src/hotspot/share/c1/c1_LIRAssembler.cpp	Mon Jul 23 18:08:46 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRAssembler.cpp	Mon Aug 20 12:08:07 2018 +0200
@@ -112,6 +112,9 @@
 
 
 LIR_Assembler::~LIR_Assembler() {
+  // The unwind handler label may be unnbound if this destructor is invoked because of a bail-out.
+  // Reset it here to avoid an assertion.
+  _unwind_handler_entry.reset();
 }