1.1 --- a/src/share/vm/oops/instanceKlass.cpp Mon Jan 27 07:54:25 2014 +0100
1.2 +++ b/src/share/vm/oops/instanceKlass.cpp Sat Feb 15 13:03:38 2014 -0500
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2014, 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 @@ -3180,7 +3180,7 @@
1.11 virtual void do_oop(narrowOop* p) { VerifyFieldClosure::do_oop_work(p); }
1.12 };
1.13
1.14 -void InstanceKlass::verify_on(outputStream* st, bool check_dictionary) {
1.15 +void InstanceKlass::verify_on(outputStream* st) {
1.16 #ifndef PRODUCT
1.17 // Avoid redundant verifies, this really should be in product.
1.18 if (_verify_count == Universe::verify_count()) return;
1.19 @@ -3188,14 +3188,11 @@
1.20 #endif
1.21
1.22 // Verify Klass
1.23 - Klass::verify_on(st, check_dictionary);
1.24 -
1.25 - // Verify that klass is present in SystemDictionary if not already
1.26 - // verifying the SystemDictionary.
1.27 - if (is_loaded() && !is_anonymous() && check_dictionary) {
1.28 - Symbol* h_name = name();
1.29 - SystemDictionary::verify_obj_klass_present(h_name, class_loader_data());
1.30 - }
1.31 + Klass::verify_on(st);
1.32 +
1.33 + // Verify that klass is present in ClassLoaderData
1.34 + guarantee(class_loader_data()->contains_klass(this),
1.35 + "this class isn't found in class loader data");
1.36
1.37 // Verify vtables
1.38 if (is_linked()) {
