--- old/src/hotspot/share/asm/codeBuffer.cpp	2019-09-17 07:17:48.748991912 +0200
+++ new/src/hotspot/share/asm/codeBuffer.cpp	2019-09-17 07:17:48.592996445 +0200
@@ -1104,7 +1104,7 @@
 // Convenience for add_comment.
 CodeString* CodeStrings::find_last(intptr_t offset) const {
   CodeString* a = _strings_last;
-  while (a != NULL && !a->is_comment() && a->offset() > offset) {
+  while (a != NULL && !(a->is_comment() && a->offset() == offset)) {
     a = a->_prev;
   }
   return a;