--- 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();
 }
 
 

--- a/src/hotspot/share/c1/c1_LIRAssembler.hpp	Mon Jul 23 18:08:46 2018 +0200
+++ b/src/hotspot/share/c1/c1_LIRAssembler.hpp	Mon Aug 20 12:08:07 2018 +0200
@@ -71,11 +71,7 @@
   void record_non_safepoint_debug_info();
 
   // unified bailout support
-  void bailout(const char* msg) {
-    // reset the label in case it hits assertion in destructor.
-    _unwind_handler_entry.reset();
-    compilation()->bailout(msg);
-  }
+  void bailout(const char* msg) const { compilation()->bailout(msg); }
   bool bailed_out() const                        { return compilation()->bailed_out(); }
 
   // code emission patterns and accessors