src/hotspot/share/prims/whitebox.hpp

*** 29,39 ****
  
  #include "utilities/exceptions.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oopsHierarchy.hpp"
  #include "oops/symbol.hpp"
! #include "runtime/interfaceSupport.hpp"
  
  // Unconditionally clear pedantic pending JNI checks
  class ClearPendingJniExcCheck : public StackObj {
  private:
    JavaThread* _thread;
--- 29,40 ----
  
  #include "utilities/exceptions.hpp"
  #include "memory/allocation.hpp"
  #include "oops/oopsHierarchy.hpp"
  #include "oops/symbol.hpp"
! 
! #define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
  
  // Unconditionally clear pedantic pending JNI checks
  class ClearPendingJniExcCheck : public StackObj {
  private:
    JavaThread* _thread;
*** 42,75 ****
    ~ClearPendingJniExcCheck() {
      _thread->clear_pending_jni_exception_check();
    }
  };
  
- // Entry macro to transition from JNI to VM state.
- 
- #define WB_ENTRY(result_type, header) JNI_ENTRY(result_type, header) \
-   ClearPendingJniExcCheck _clearCheck(env);
- 
- #define WB_END JNI_END
- #define WB_METHOD_DECLARE(result_type) extern "C" result_type JNICALL
- 
- #define CHECK_JNI_EXCEPTION_(env, value)                               \
-   do {                                                                 \
-     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
-     if (HAS_PENDING_EXCEPTION) {                                       \
-       return(value);                                                   \
-     }                                                                  \
-   } while (0)
- 
- #define CHECK_JNI_EXCEPTION(env)                                       \
-   do {                                                                 \
-     JavaThread* THREAD = JavaThread::thread_from_jni_environment(env); \
-     if (HAS_PENDING_EXCEPTION) {                                       \
-       return;                                                          \
-     }                                                                  \
-   } while (0)
- 
  class CodeBlob;
  class CodeHeap;
  class JavaThread;
  
  class WhiteBox : public AllStatic {
--- 43,52 ----
*** 91,98 ****
      JNINativeMethod* method_array, int method_count);
    static void register_extended(JNIEnv* env, jclass wbclass, JavaThread* thread);
    static bool compile_method(Method* method, int comp_level, int bci, Thread* THREAD);
  };
  
- 
- 
  #endif // SHARE_VM_PRIMS_WHITEBOX_HPP
--- 68,73 ----