< prev index next >
src/hotspot/share/runtime/vframe.cpp
Print this page
rev 56777 : See CR7-to-CR8-changes.
@@ -120,12 +120,16 @@
GrowableArray<MonitorInfo*>* mons = monitors();
GrowableArray<MonitorInfo*>* result = new GrowableArray<MonitorInfo*>(mons->length());
if (mons->is_empty()) return result;
bool found_first_monitor = false;
- ObjectMonitor *pending_monitor = thread()->current_pending_monitor();
- ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor();
+ ObjectMonitorHandle omh;
+ ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor(&omh);
+ ObjectMonitor *pending_monitor = NULL;
+ if (waiting_monitor == NULL) {
+ pending_monitor = thread()->current_pending_monitor(&omh);
+ }
oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : (oop) NULL);
oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : (oop) NULL);
for (int index = (mons->length()-1); index >= 0; index--) {
MonitorInfo* monitor = mons->at(index);
@@ -229,13 +233,14 @@
// monitor before, then we need to see if we have completed
// the lock or if we are blocked trying to acquire it. Only
// an inflated monitor that is first on the monitor list in
// the first frame can block us on a monitor enter.
markWord mark = monitor->owner()->mark();
+ ObjectMonitorHandle omh;
if (mark.has_monitor() &&
( // we have marked ourself as pending on this monitor
- mark.monitor() == thread()->current_pending_monitor() ||
+ mark.monitor() == thread()->current_pending_monitor(&omh) ||
// we are not the owner of this monitor
!mark.monitor()->is_entered(thread())
)) {
lock_state = "waiting to lock";
}
< prev index next >