src/share/vm/interpreter/bytecodeInterpreter.cpp

rev 13309 : 8185263: Fix zero build after 8169881, 8175318, 8178350
Reviewed-by:

*** 2788,2798 ****
      // expression stack is emptied
      topOfStack = istate->stack_base() - Interpreter::stackElementWords;
      CALL_VM(continuation_bci = (intptr_t)InterpreterRuntime::exception_handler_for_exception(THREAD, except_oop()),
              handle_exception);
  
!     except_oop = THREAD->vm_result();
      THREAD->set_vm_result(NULL);
      if (continuation_bci >= 0) {
        // Place exception on top of stack
        SET_STACK_OBJECT(except_oop(), 0);
        MORE_STACK(1);
--- 2788,2798 ----
      // expression stack is emptied
      topOfStack = istate->stack_base() - Interpreter::stackElementWords;
      CALL_VM(continuation_bci = (intptr_t)InterpreterRuntime::exception_handler_for_exception(THREAD, except_oop()),
              handle_exception);
  
!     except_oop = Handle(THREAD, THREAD->vm_result());
      THREAD->set_vm_result(NULL);
      if (continuation_bci >= 0) {
        // Place exception on top of stack
        SET_STACK_OBJECT(except_oop(), 0);
        MORE_STACK(1);
*** 2992,3002 ****
                // Prevent any HandleMarkCleaner from freeing our live handles
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::throw_illegal_monitor_state_exception(THREAD));
              }
              assert(THREAD->has_pending_exception(), "Lost our exception!");
!             illegal_state_oop = THREAD->pending_exception();
              THREAD->clear_pending_exception();
            }
          }
          end++;
        }
--- 2992,3002 ----
                // Prevent any HandleMarkCleaner from freeing our live handles
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::throw_illegal_monitor_state_exception(THREAD));
              }
              assert(THREAD->has_pending_exception(), "Lost our exception!");
!             illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
              THREAD->clear_pending_exception();
            }
          }
          end++;
        }
*** 3009,3019 ****
                // Prevent any HandleMarkCleaner from freeing our live handles
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::throw_illegal_monitor_state_exception(THREAD));
              }
              assert(THREAD->has_pending_exception(), "Lost our exception!");
!             illegal_state_oop = THREAD->pending_exception();
              THREAD->clear_pending_exception();
            }
          } else {
            //
            // The initial monitor is always used for the method
--- 3009,3019 ----
                // Prevent any HandleMarkCleaner from freeing our live handles
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::throw_illegal_monitor_state_exception(THREAD));
              }
              assert(THREAD->has_pending_exception(), "Lost our exception!");
!             illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
              THREAD->clear_pending_exception();
            }
          } else {
            //
            // The initial monitor is always used for the method
*** 3026,3046 ****
            //
            oop rcvr = base->obj();
            if (rcvr == NULL) {
              if (!suppress_error) {
                VM_JAVA_ERROR_NO_JUMP(vmSymbols::java_lang_NullPointerException(), "", note_nullCheck_trap);
!               illegal_state_oop = THREAD->pending_exception();
                THREAD->clear_pending_exception();
              }
            } else if (UseHeavyMonitors) {
              {
                // Prevent any HandleMarkCleaner from freeing our live handles.
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(THREAD, base));
              }
              if (THREAD->has_pending_exception()) {
!               if (!suppress_error) illegal_state_oop = THREAD->pending_exception();
                THREAD->clear_pending_exception();
              }
            } else {
              BasicLock* lock = base->lock();
              markOop header = lock->displaced_header();
--- 3026,3046 ----
            //
            oop rcvr = base->obj();
            if (rcvr == NULL) {
              if (!suppress_error) {
                VM_JAVA_ERROR_NO_JUMP(vmSymbols::java_lang_NullPointerException(), "", note_nullCheck_trap);
!               illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
                THREAD->clear_pending_exception();
              }
            } else if (UseHeavyMonitors) {
              {
                // Prevent any HandleMarkCleaner from freeing our live handles.
                HandleMark __hm(THREAD);
                CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(THREAD, base));
              }
              if (THREAD->has_pending_exception()) {
!               if (!suppress_error) illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
                THREAD->clear_pending_exception();
              }
            } else {
              BasicLock* lock = base->lock();
              markOop header = lock->displaced_header();
*** 3057,3067 ****
                      // Prevent any HandleMarkCleaner from freeing our live handles
                      HandleMark __hm(THREAD);
                      CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(THREAD, base));
                    }
                    if (THREAD->has_pending_exception()) {
!                     if (!suppress_error) illegal_state_oop = THREAD->pending_exception();
                      THREAD->clear_pending_exception();
                    }
                  }
                }
              }
--- 3057,3067 ----
                      // Prevent any HandleMarkCleaner from freeing our live handles
                      HandleMark __hm(THREAD);
                      CALL_VM_NOCHECK(InterpreterRuntime::monitorexit(THREAD, base));
                    }
                    if (THREAD->has_pending_exception()) {
!                     if (!suppress_error) illegal_state_oop = Handle(THREAD, THREAD->pending_exception());
                      THREAD->clear_pending_exception();
                    }
                  }
                }
              }