Mercurial > hg > graal-jvmci-8
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/runtime/vframe.cpp Mon May 17 00:47:28 2010 -0700 +++ b/src/share/vm/runtime/vframe.cpp Tue May 18 11:02:18 2010 -0700 @@ -101,8 +101,8 @@ bool found_first_monitor = false; ObjectMonitor *pending_monitor = thread()->current_pending_monitor(); ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor(); - oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : NULL); - oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : NULL); + 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);