--- old/src/share/vm/c1/c1_LIRAssembler.hpp	2018-11-07 18:58:42.649317919 +0000
+++ new/src/share/vm/c1/c1_LIRAssembler.hpp	2018-11-07 18:58:42.499317026 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -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