diff --git a/src/hotspot/share/runtime/vmStructs.cpp b/src/hotspot/share/runtime/vmStructs.cpp
index e3b4596f375..537f063a2b1 100644
--- a/src/hotspot/share/runtime/vmStructs.cpp
+++ b/src/hotspot/share/runtime/vmStructs.cpp
@@ -525,79 +525,10 @@
   nonstatic_field(InterpreterCodelet,          _bytecode,                                     Bytecodes::Code)                       \
                                                                                                                                      \
   /***********************************/                                                                                              \
-  /* StubRoutines (NOTE: incomplete) */                                                                                              \
+  /* StubRoutine for stack walking.  */                                                                                              \
   /***********************************/                                                                                              \
                                                                                                                                      \
-     static_field(StubRoutines,                _verify_oop_count,                             jint)                                  \
      static_field(StubRoutines,                _call_stub_return_address,                     address)                               \
-     static_field(StubRoutines,                _aescrypt_encryptBlock,                        address)                               \
-     static_field(StubRoutines,                _aescrypt_decryptBlock,                        address)                               \
-     static_field(StubRoutines,                _cipherBlockChaining_encryptAESCrypt,          address)                               \
-     static_field(StubRoutines,                _cipherBlockChaining_decryptAESCrypt,          address)                               \
-     static_field(StubRoutines,                _electronicCodeBook_encryptAESCrypt,           address)                               \
-     static_field(StubRoutines,                _electronicCodeBook_decryptAESCrypt,           address)                               \
-     static_field(StubRoutines,                _counterMode_AESCrypt,                         address)                               \
-     static_field(StubRoutines,                _galoisCounterMode_AESCrypt,                   address)                               \
-     static_field(StubRoutines,                _ghash_processBlocks,                          address)                               \
-     static_field(StubRoutines,                _chacha20Block,                                address)                               \
-     static_field(StubRoutines,                _base64_encodeBlock,                           address)                               \
-     static_field(StubRoutines,                _base64_decodeBlock,                           address)                               \
-     static_field(StubRoutines,                _poly1305_processBlocks,                       address)                               \
-     static_field(StubRoutines,                _updateBytesCRC32,                             address)                               \
-     static_field(StubRoutines,                _crc_table_adr,                                address)                               \
-     static_field(StubRoutines,                _crc32c_table_addr,                            address)                               \
-     static_field(StubRoutines,                _updateBytesCRC32C,                            address)                               \
-     static_field(StubRoutines,                _updateBytesAdler32,                           address)                               \
-     static_field(StubRoutines,                _multiplyToLen,                                address)                               \
-     static_field(StubRoutines,                _squareToLen,                                  address)                               \
-     static_field(StubRoutines,                _bigIntegerRightShiftWorker,                   address)                               \
-     static_field(StubRoutines,                _bigIntegerLeftShiftWorker,                    address)                               \
-     static_field(StubRoutines,                _mulAdd,                                       address)                               \
-     static_field(StubRoutines,                _dexp,                                         address)                               \
-     static_field(StubRoutines,                _dlog,                                         address)                               \
-     static_field(StubRoutines,                _dlog10,                                       address)                               \
-     static_field(StubRoutines,                _dpow,                                         address)                               \
-     static_field(StubRoutines,                _fmod,                                         address)                               \
-     static_field(StubRoutines,                _dsin,                                         address)                               \
-     static_field(StubRoutines,                _dcos,                                         address)                               \
-     static_field(StubRoutines,                _dtan,                                         address)                               \
-     static_field(StubRoutines,                _vectorizedMismatch,                           address)                               \
-     static_field(StubRoutines,                _jbyte_arraycopy,                              address)                               \
-     static_field(StubRoutines,                _jshort_arraycopy,                             address)                               \
-     static_field(StubRoutines,                _jint_arraycopy,                               address)                               \
-     static_field(StubRoutines,                _jlong_arraycopy,                              address)                               \
-     static_field(StubRoutines,                _oop_arraycopy,                                address)                               \
-     static_field(StubRoutines,                _oop_arraycopy_uninit,                         address)                               \
-     static_field(StubRoutines,                _jbyte_disjoint_arraycopy,                     address)                               \
-     static_field(StubRoutines,                _jshort_disjoint_arraycopy,                    address)                               \
-     static_field(StubRoutines,                _jint_disjoint_arraycopy,                      address)                               \
-     static_field(StubRoutines,                _jlong_disjoint_arraycopy,                     address)                               \
-     static_field(StubRoutines,                _oop_disjoint_arraycopy,                       address)                               \
-     static_field(StubRoutines,                _oop_disjoint_arraycopy_uninit,                address)                               \
-     static_field(StubRoutines,                _arrayof_jbyte_arraycopy,                      address)                               \
-     static_field(StubRoutines,                _arrayof_jshort_arraycopy,                     address)                               \
-     static_field(StubRoutines,                _arrayof_jint_arraycopy,                       address)                               \
-     static_field(StubRoutines,                _arrayof_jlong_arraycopy,                      address)                               \
-     static_field(StubRoutines,                _arrayof_oop_arraycopy,                        address)                               \
-     static_field(StubRoutines,                _arrayof_oop_arraycopy_uninit,                 address)                               \
-     static_field(StubRoutines,                _arrayof_jbyte_disjoint_arraycopy,             address)                               \
-     static_field(StubRoutines,                _arrayof_jshort_disjoint_arraycopy,            address)                               \
-     static_field(StubRoutines,                _arrayof_jint_disjoint_arraycopy,              address)                               \
-     static_field(StubRoutines,                _arrayof_jlong_disjoint_arraycopy,             address)                               \
-     static_field(StubRoutines,                _arrayof_oop_disjoint_arraycopy,               address)                               \
-     static_field(StubRoutines,                _arrayof_oop_disjoint_arraycopy_uninit,        address)                               \
-     static_field(StubRoutines,                _checkcast_arraycopy,                          address)                               \
-     static_field(StubRoutines,                _checkcast_arraycopy_uninit,                   address)                               \
-     static_field(StubRoutines,                _unsafe_arraycopy,                             address)                               \
-     static_field(StubRoutines,                _generic_arraycopy,                            address)                               \
-                                                                                                                                     \
-  /*****************/                                                                                                                \
-  /* SharedRuntime */                                                                                                                \
-  /*****************/                                                                                                                \
-                                                                                                                                     \
-     static_field(SharedRuntime,               _wrong_method_blob,                            RuntimeStub*)                          \
-     static_field(SharedRuntime,               _ic_miss_blob,                                 RuntimeStub*)                          \
-     static_field(SharedRuntime,               _deopt_blob,                                   DeoptimizationBlob*)                   \
                                                                                                                                      \
   /***************************************/                                                                                          \
   /* PcDesc and other compiled code info */                                                                                          \