--- a/hotspot/src/share/vm/runtime/thread.hpp	Tue Dec 08 14:26:17 2015 +0000
+++ b/hotspot/src/share/vm/runtime/thread.hpp	Mon Dec 14 17:02:02 2015 -1000
@@ -101,6 +101,7 @@
 
 class Thread: public ThreadShadow {
   friend class VMStructs;
+  friend class JVMCIVMStructs;
  private:
   // Exception handling
   // (Note: _pending_exception and friends are in ThreadShadow)
@@ -775,6 +776,7 @@
 
 class JavaThread: public Thread {
   friend class VMStructs;
+  friend class JVMCIVMStructs;
   friend class WhiteBox;
  private:
   JavaThread*    _next;                          // The next thread in the Threads list