archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6837472: com/sun/jdi/MonitorFrameInfo.java fails with AggressiveOpts in 6u14

Browse source 
Disable escape analysis when jvmti/debugger is used. Add support for EA ibto SA.

Reviewed-by: never
This commit is contained in:
Vladimir Kozlov 2009-06-09 16:19:10 -07:00
parent 0429abd38a
commit 7b9d6a79ac
22 changed files with 350 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hotspot/src/share/vm/prims/jvmtiEnvBase.cpp
View file

@ -606,6 +606,7 @@ JvmtiEnvBase::count_locked_objects(JavaThread *java_thread, Handle hobj) {
if (!mons->is_empty()) {
for (int i = 0; i < mons->length(); i++) {
MonitorInfo *mi = mons->at(i);
if (mi->owner_is_scalar_replaced()) continue;
// see if owner of the monitor is our object
if (mi->owner() != NULL && mi->owner() == hobj()) {
@ -726,6 +727,8 @@ JvmtiEnvBase::get_locked_objects_in_frame(JavaThread* calling_thread, JavaThread
for (int i = 0; i < mons->length(); i++) {
MonitorInfo *mi = mons->at(i);
if (mi->owner_is_scalar_replaced()) continue;
oop obj = mi->owner();
if (obj == NULL) {
// this monitor doesn't have an owning object so skip it