--- a/src/hotspot/share/asm/codeBuffer.hpp	Thu Oct 17 20:27:44 2019 +0100
+++ b/src/hotspot/share/asm/codeBuffer.hpp	Thu Oct 17 20:53:35 2019 +0100
@@ -249,6 +249,7 @@
 private:
 #ifndef PRODUCT
   CodeString* _strings;
+  CodeString* _strings_last;
 #ifdef ASSERT
   // Becomes true after copy-out, forbids further use.
   bool _defunct; // Zero bit pattern is "valid", see memset call in decode_env::decode_env
@@ -262,6 +263,7 @@
   void set_null_and_invalidate() {
 #ifndef PRODUCT
     _strings = NULL;
+    _strings_last = NULL;
 #ifdef ASSERT
     _defunct = true;
 #endif
@@ -272,6 +274,7 @@
   CodeStrings() {
 #ifndef PRODUCT
     _strings = NULL;
+    _strings_last = NULL;
 #ifdef ASSERT
     _defunct = false;
 #endif
@@ -413,6 +416,7 @@
                        || PrintMethodHandleStubs
                        || PrintInterpreter
                        || PrintSignatureHandlers
+                       || UnlockDiagnosticVMOptions
                         );
   }