--- a/src/share/vm/utilities/exceptions.hpp	Mon Aug 24 10:38:13 2015 -0700
+++ b/src/share/vm/utilities/exceptions.hpp	Mon Aug 24 22:35:47 2015 +0200
@@ -61,12 +61,6 @@
   friend class VMStructs;
 
  protected:
-#if INCLUDE_JVMCI
-  int _pending_deoptimization;
-  oop _pending_failed_speculation;
-  bool _pending_monitorenter;
-  bool _pending_transfer_to_interpreter;
-#endif
   oop  _pending_exception;                       // Thread has gc actions.
   const char* _exception_file;                   // file information for exception (debugging only)
   int         _exception_line;                   // line information for exception (debugging only)
@@ -85,24 +79,9 @@
   bool has_pending_exception() const             { return _pending_exception != NULL; }
   const char* exception_file() const             { return _exception_file; }
   int  exception_line() const                    { return _exception_line; }
-#if INCLUDE_JVMCI
-  int  pending_deoptimization() const            { return _pending_deoptimization; }
-  oop  pending_failed_speculation() const        { return _pending_failed_speculation; }
-  bool has_pending_monitorenter() const          { return _pending_monitorenter; }
-#endif
 
   // Code generation support
   static ByteSize pending_exception_offset()     { return byte_offset_of(ThreadShadow, _pending_exception); }
-#if INCLUDE_JVMCI
-  static ByteSize pending_deoptimization_offset() { return byte_offset_of(ThreadShadow, _pending_deoptimization); }
-  static ByteSize pending_monitorenter_offset()  { return byte_offset_of(ThreadShadow, _pending_monitorenter); }
-  static ByteSize pending_failed_speculation_offset() { return byte_offset_of(ThreadShadow, _pending_failed_speculation); }
-
-  void set_pending_monitorenter(bool b)          { _pending_monitorenter = b; }
-  void set_pending_deoptimization(int reason)    { _pending_deoptimization = reason; }
-  void set_pending_failed_speculation(oop failed_speculation)    { _pending_failed_speculation = failed_speculation; }
-  void set_pending_transfer_to_interpreter(bool b) { _pending_transfer_to_interpreter = b; }
-#endif
 
   // use THROW whenever possible!
   void set_pending_exception(oop exception, const char* file, int line);
@@ -112,9 +91,6 @@
 
   ThreadShadow() : _pending_exception(NULL),
                    _exception_file(NULL), _exception_line(0)
-#if INCLUDE_JVMCI
-                   , _pending_monitorenter(false), _pending_deoptimization(-1), _pending_failed_speculation(NULL), _pending_transfer_to_interpreter(false)
-#endif
   {}
 };