Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/vframe.cpp @ 1547:fb1a39993f69
6951319: enable solaris builds using Sun Studio 12 update 1
Reviewed-by: kamg, ysr, dholmes, johnc
author | jcoomes |
---|---|
date | Tue, 18 May 2010 11:02:18 -0700 |
parents | 2338d41fbd81 |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1546:a00b51b2dda4 | 1547:fb1a39993f69 |
---|---|
99 if (mons->is_empty()) return result; | 99 if (mons->is_empty()) return result; |
100 | 100 |
101 bool found_first_monitor = false; | 101 bool found_first_monitor = false; |
102 ObjectMonitor *pending_monitor = thread()->current_pending_monitor(); | 102 ObjectMonitor *pending_monitor = thread()->current_pending_monitor(); |
103 ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor(); | 103 ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor(); |
104 oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : NULL); | 104 oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : (oop) NULL); |
105 oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : NULL); | 105 oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : (oop) NULL); |
106 | 106 |
107 for (int index = (mons->length()-1); index >= 0; index--) { | 107 for (int index = (mons->length()-1); index >= 0; index--) { |
108 MonitorInfo* monitor = mons->at(index); | 108 MonitorInfo* monitor = mons->at(index); |
109 if (monitor->eliminated() && is_compiled_frame()) continue; // skip eliminated monitor | 109 if (monitor->eliminated() && is_compiled_frame()) continue; // skip eliminated monitor |
110 oop obj = monitor->owner(); | 110 oop obj = monitor->owner(); |