Tue, 14 Feb 2012 23:50:12 -0800
Merge
1.1 --- a/src/share/vm/prims/jvmtiTagMap.cpp Wed Feb 15 00:09:31 2012 -0500 1.2 +++ b/src/share/vm/prims/jvmtiTagMap.cpp Tue Feb 14 23:50:12 2012 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -2999,7 +2999,8 @@ 1.11 char type = field->field_type(); 1.12 if (!is_primitive_field_type(type)) { 1.13 oop fld_o = o->obj_field(field->field_offset()); 1.14 - if (fld_o != NULL) { 1.15 + // ignore any objects that aren't visible to profiler 1.16 + if (fld_o != NULL && ServiceUtil::visible_oop(fld_o)) { 1.17 // reflection code may have a reference to a klassOop. 1.18 // - see sun.reflect.UnsafeStaticFieldAccessorImpl and sun.misc.Unsafe 1.19 if (fld_o->is_klass()) {