--- old/src/hotspot/share/memory/universe.hpp	2018-03-26 13:40:55.418139804 -0400
+++ new/src/hotspot/share/memory/universe.hpp	2018-03-26 13:40:55.036104510 -0400
@@ -39,6 +39,7 @@
 
 class CollectedHeap;
 class DeferredObjAllocEvent;
+class OopStorage;
 
 
 // A helper class for caching a Method* when the user of the cache
@@ -124,6 +125,9 @@
 
   static Klass* _objectArrayKlassObj;
 
+  // VM weak OopStorage object.
+  static OopStorage* _vm_weak_oop_storage;
+
   // Known objects in the VM
 
   // Primitive objects
@@ -229,6 +233,8 @@
   static void reinitialize_itables(TRAPS);
   static void compute_base_vtable_size();             // compute vtable size of class Object
 
+  static void initialize_oop_storage();
+
   static void genesis(TRAPS);                         // Create the initial world
 
   // Mirrors for primitive classes (created eagerly)
@@ -288,6 +294,8 @@
     return _typeArrayKlassObjs[t];
   }
 
+  static OopStorage* vm_weak_oop_storage();
+
   // Known objects in the VM
   static oop int_mirror()                   { return check_mirror(_int_mirror); }
   static oop float_mirror()                 { return check_mirror(_float_mirror); }