src/hotspot/share/runtime/vframe.cpp

rev 59271 : 8153224.v2.10.patch merged with 8153224.v2.11.patch.
rev 59272 : CR1 changes from dcubed, dholmes, eosterlund and rehn.

*** 122,132 ****
    if (mons->is_empty()) return result;
  
    bool found_first_monitor = false;
    // The ObjectMonitor* can't be async deflated since we are either
    // at a safepoint or the calling thread is operating on itself so
!   // it cannot leave the underlying wait()/enter() call.
    ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor();
    ObjectMonitor *pending_monitor = NULL;
    if (waiting_monitor == NULL) {
      pending_monitor = thread()->current_pending_monitor();
    }
--- 122,132 ----
    if (mons->is_empty()) return result;
  
    bool found_first_monitor = false;
    // The ObjectMonitor* can't be async deflated since we are either
    // at a safepoint or the calling thread is operating on itself so
!   // it cannot exit the ObjectMonitor so it remains busy.
    ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor();
    ObjectMonitor *pending_monitor = NULL;
    if (waiting_monitor == NULL) {
      pending_monitor = thread()->current_pending_monitor();
    }