1.1 --- a/src/share/vm/oops/instanceRefKlass.cpp Fri Apr 13 01:59:38 2012 +0200
1.2 +++ b/src/share/vm/oops/instanceRefKlass.cpp Mon Apr 16 08:57:18 2012 +0200
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 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 @@ -497,36 +497,12 @@
1.11
1.12 if (referent != NULL) {
1.13 guarantee(referent->is_oop(), "referent field heap failed");
1.14 - if (gch != NULL && !gch->is_in_young(obj)) {
1.15 - // We do a specific remembered set check here since the referent
1.16 - // field is not part of the oop mask and therefore skipped by the
1.17 - // regular verify code.
1.18 - if (UseCompressedOops) {
1.19 - narrowOop* referent_addr = (narrowOop*)java_lang_ref_Reference::referent_addr(obj);
1.20 - obj->verify_old_oop(referent_addr, true);
1.21 - } else {
1.22 - oop* referent_addr = (oop*)java_lang_ref_Reference::referent_addr(obj);
1.23 - obj->verify_old_oop(referent_addr, true);
1.24 - }
1.25 - }
1.26 }
1.27 // Verify next field
1.28 oop next = java_lang_ref_Reference::next(obj);
1.29 if (next != NULL) {
1.30 guarantee(next->is_oop(), "next field verify failed");
1.31 guarantee(next->is_instanceRef(), "next field verify failed");
1.32 - if (gch != NULL && !gch->is_in_young(obj)) {
1.33 - // We do a specific remembered set check here since the next field is
1.34 - // not part of the oop mask and therefore skipped by the regular
1.35 - // verify code.
1.36 - if (UseCompressedOops) {
1.37 - narrowOop* next_addr = (narrowOop*)java_lang_ref_Reference::next_addr(obj);
1.38 - obj->verify_old_oop(next_addr, true);
1.39 - } else {
1.40 - oop* next_addr = (oop*)java_lang_ref_Reference::next_addr(obj);
1.41 - obj->verify_old_oop(next_addr, true);
1.42 - }
1.43 - }
1.44 }
1.45 }
1.46
