*** old/src/share/vm/prims/whitebox.cpp	Wed Feb 12 10:42:24 2014
--- new/src/share/vm/prims/whitebox.cpp	Wed Feb 12 10:42:24 2014

*** 314,326 ****
--- 314,327 ----
    VMThread::execute(&op);
  WB_END
  
  WB_ENTRY(jint, WB_DeoptimizeMethod(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   int result = 0;
+   CHECK_JNI_EXCEPTION_(env, result);
    MutexLockerEx mu(Compile_lock);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    int result = 0;
    nmethod* code;
    if (is_osr) {
      int bci = InvocationEntryBci;
      while ((code = mh->lookup_osr_nmethod_for(bci, CompLevel_none, false)) != NULL) {
        code->mark_for_deoptimization();

*** 342,351 ****
--- 343,353 ----
    return result;
  WB_END
  
  WB_ENTRY(jboolean, WB_IsMethodCompiled(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    MutexLockerEx mu(Compile_lock);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    nmethod* code = is_osr ? mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false) : mh->code();
    if (code == NULL) {
      return JNI_FALSE;

*** 353,362 ****
--- 355,365 ----
    return (code->is_alive() && !code->is_marked_for_deoptimization());
  WB_END
  
  WB_ENTRY(jboolean, WB_IsMethodCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level, jboolean is_osr))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    MutexLockerEx mu(Compile_lock);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    if (is_osr) {
      return CompilationPolicy::can_be_osr_compiled(mh, comp_level);
    } else {

*** 364,404 ****
--- 367,412 ----
    }
  WB_END
  
  WB_ENTRY(jboolean, WB_IsMethodQueuedForCompilation(JNIEnv* env, jobject o, jobject method))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    MutexLockerEx mu(Compile_lock);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    return mh->queued_for_compilation();
  WB_END
  
  WB_ENTRY(jint, WB_GetMethodCompilationLevel(JNIEnv* env, jobject o, jobject method, jboolean is_osr))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, CompLevel_none);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    nmethod* code = is_osr ? mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false) : mh->code();
    return (code != NULL ? code->comp_level() : CompLevel_none);
  WB_END
  
  WB_ENTRY(void, WB_MakeMethodNotCompilable(JNIEnv* env, jobject o, jobject method, jint comp_level, jboolean is_osr))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION(env);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    if (is_osr) {
      mh->set_not_osr_compilable(comp_level, true /* report */, "WhiteBox");
    } else {
      mh->set_not_compilable(comp_level, true /* report */, "WhiteBox");
    }
  WB_END
  
  WB_ENTRY(jint, WB_GetMethodEntryBci(JNIEnv* env, jobject o, jobject method))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, InvocationEntryBci);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    nmethod* code = mh->lookup_osr_nmethod_for(InvocationEntryBci, CompLevel_none, false);
    return (code != NULL && code->is_osr_method() ? code->osr_entry_bci() : InvocationEntryBci);
  WB_END
  
  WB_ENTRY(jboolean, WB_TestSetDontInlineMethod(JNIEnv* env, jobject o, jobject method, jboolean value))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    bool result = mh->dont_inline();
    mh->set_dont_inline(value == JNI_TRUE);
    return result;
  WB_END

*** 412,437 ****
--- 420,448 ----
    }
  WB_END
  
  WB_ENTRY(jboolean, WB_TestSetForceInlineMethod(JNIEnv* env, jobject o, jobject method, jboolean value))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    bool result = mh->force_inline();
    mh->set_force_inline(value == JNI_TRUE);
    return result;
  WB_END
  
  WB_ENTRY(jboolean, WB_EnqueueMethodForCompilation(JNIEnv* env, jobject o, jobject method, jint comp_level, jint bci))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION_(env, JNI_FALSE);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    nmethod* nm = CompileBroker::compile_method(mh, bci, comp_level, mh, mh->invocation_count(), "WhiteBox", THREAD);
    MutexLockerEx mu(Compile_lock);
    return (mh->queued_for_compilation() || nm != NULL);
  WB_END
  
  WB_ENTRY(void, WB_ClearMethodState(JNIEnv* env, jobject o, jobject method))
    jmethodID jmid = reflected_method_to_jmid(thread, env, method);
+   CHECK_JNI_EXCEPTION(env);
    methodHandle mh(THREAD, Method::checked_resolve_jmethod_id(jmid));
    MutexLockerEx mu(Compile_lock);
    MethodData* mdo = mh->method_data();
    MethodCounters* mcs = mh->method_counters();
  

*** 614,631 ****
--- 625,646 ----
          ResourceMark rm;
          ThreadToNativeFromVM ttnfv(thread); // can't be in VM when we call JNI
          bool result = true;
          //  one by one registration natives for exception catching
          jclass exceptionKlass = env->FindClass(vmSymbols::java_lang_NoSuchMethodError()->as_C_string());
+         CHECK_JNI_EXCEPTION(env);
          for (int i = 0, n = sizeof(methods) / sizeof(methods[0]); i < n; ++i) {
            if (env->RegisterNatives(wbclass, methods + i, 1) != 0) {
              result = false;
              if (env->ExceptionCheck() && env->IsInstanceOf(env->ExceptionOccurred(), exceptionKlass)) {
+             jthrowable throwable_obj = env->ExceptionOccurred();
+             if (throwable_obj != NULL) {
+               env->ExceptionClear();
+               if (env->IsInstanceOf(throwable_obj, exceptionKlass)) {
                  // j.l.NoSuchMethodError is thrown when a method can't be found or a method is not native
                  // ignoring the exception
                  tty->print_cr("Warning: 'NoSuchMethodError' on register of sun.hotspot.WhiteBox::%s%s", methods[i].name, methods[i].signature);
                env->ExceptionClear();
+               }
              } else {
                // register is failed w/o exception or w/ unexpected exception
                tty->print_cr("Warning: unexpected error on register of sun.hotspot.WhiteBox::%s%s. All methods will be unregistered", methods[i].name, methods[i].signature);
                env->UnregisterNatives(wbclass);
                break;