--- old/src/hotspot/share/c1/c1_LIRAssembler.hpp	2018-07-20 11:34:00.000000000 -0700
+++ new/src/hotspot/share/c1/c1_LIRAssembler.hpp	2018-07-20 11:34:00.000000000 -0700
@@ -71,7 +71,11 @@
   void record_non_safepoint_debug_info();
 
   // unified bailout support
-  void bailout(const char* msg) const            { compilation()->bailout(msg); }
+  void bailout(const char* msg) {
+    // reset the label in case it hits assertion in destructor.
+    _unwind_handler_entry.reset();
+    compilation()->bailout(msg);
+  }
   bool bailed_out() const                        { return compilation()->bailed_out(); }
 
   // code emission patterns and accessors