Tue, 20 Jul 2010 08:41:42 -0700
6964170: Verifier crashes
Summary: Check if klassOop != NULL rather than klass_part != NULL
Reviewed-by: kamg, never
duke@435 | 1 | /* |
trims@1907 | 2 | * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. |
duke@435 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
duke@435 | 4 | * |
duke@435 | 5 | * This code is free software; you can redistribute it and/or modify it |
duke@435 | 6 | * under the terms of the GNU General Public License version 2 only, as |
duke@435 | 7 | * published by the Free Software Foundation. |
duke@435 | 8 | * |
duke@435 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
duke@435 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
duke@435 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
duke@435 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
duke@435 | 13 | * accompanied this code). |
duke@435 | 14 | * |
duke@435 | 15 | * You should have received a copy of the GNU General Public License version |
duke@435 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
duke@435 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
duke@435 | 18 | * |
trims@1907 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
trims@1907 | 20 | * or visit www.oracle.com if you need additional information or have any |
trims@1907 | 21 | * questions. |
duke@435 | 22 | * |
duke@435 | 23 | */ |
duke@435 | 24 | |
duke@435 | 25 | # include "incls/_precompiled.incl" |
duke@435 | 26 | # include "incls/_resolutionErrors.cpp.incl" |
duke@435 | 27 | |
duke@435 | 28 | // add new entry to the table |
duke@435 | 29 | void ResolutionErrorTable::add_entry(int index, unsigned int hash, |
duke@435 | 30 | constantPoolHandle pool, int cp_index, symbolHandle error) |
duke@435 | 31 | { |
duke@435 | 32 | assert_locked_or_safepoint(SystemDictionary_lock); |
duke@435 | 33 | assert(!pool.is_null() && !error.is_null(), "adding NULL obj"); |
duke@435 | 34 | |
duke@435 | 35 | ResolutionErrorEntry* entry = new_entry(hash, pool(), cp_index, error()); |
duke@435 | 36 | add_entry(index, entry); |
duke@435 | 37 | } |
duke@435 | 38 | |
duke@435 | 39 | // find entry in the table |
duke@435 | 40 | ResolutionErrorEntry* ResolutionErrorTable::find_entry(int index, unsigned int hash, |
duke@435 | 41 | constantPoolHandle pool, int cp_index) |
duke@435 | 42 | { |
duke@435 | 43 | assert_locked_or_safepoint(SystemDictionary_lock); |
duke@435 | 44 | |
duke@435 | 45 | for (ResolutionErrorEntry *error_probe = bucket(index); |
duke@435 | 46 | error_probe != NULL; |
duke@435 | 47 | error_probe = error_probe->next()) { |
duke@435 | 48 | if (error_probe->hash() == hash && error_probe->pool() == pool()) { |
duke@435 | 49 | return error_probe;; |
duke@435 | 50 | } |
duke@435 | 51 | } |
duke@435 | 52 | return NULL; |
duke@435 | 53 | } |
duke@435 | 54 | |
duke@435 | 55 | // create new error entry |
duke@435 | 56 | ResolutionErrorEntry* ResolutionErrorTable::new_entry(int hash, constantPoolOop pool, |
duke@435 | 57 | int cp_index, symbolOop error) |
duke@435 | 58 | { |
duke@435 | 59 | ResolutionErrorEntry* entry = (ResolutionErrorEntry*)Hashtable::new_entry(hash, pool); |
duke@435 | 60 | entry->set_cp_index(cp_index); |
duke@435 | 61 | entry->set_error(error); |
duke@435 | 62 | |
duke@435 | 63 | return entry; |
duke@435 | 64 | } |
duke@435 | 65 | |
duke@435 | 66 | // create resolution error table |
duke@435 | 67 | ResolutionErrorTable::ResolutionErrorTable(int table_size) |
duke@435 | 68 | : Hashtable(table_size, sizeof(ResolutionErrorEntry)) { |
duke@435 | 69 | } |
duke@435 | 70 | |
duke@435 | 71 | // GC support |
duke@435 | 72 | void ResolutionErrorTable::oops_do(OopClosure* f) { |
duke@435 | 73 | for (int i = 0; i < table_size(); i++) { |
duke@435 | 74 | for (ResolutionErrorEntry* probe = bucket(i); |
duke@435 | 75 | probe != NULL; |
duke@435 | 76 | probe = probe->next()) { |
duke@435 | 77 | assert(probe->pool() != (constantPoolOop)NULL, "resolution error table is corrupt"); |
duke@435 | 78 | assert(probe->error() != (symbolOop)NULL, "resolution error table is corrupt"); |
duke@435 | 79 | probe->oops_do(f); |
duke@435 | 80 | } |
duke@435 | 81 | } |
duke@435 | 82 | } |
duke@435 | 83 | |
duke@435 | 84 | // GC support |
duke@435 | 85 | void ResolutionErrorEntry::oops_do(OopClosure* blk) { |
duke@435 | 86 | blk->do_oop((oop*)pool_addr()); |
duke@435 | 87 | blk->do_oop((oop*)error_addr()); |
duke@435 | 88 | } |
duke@435 | 89 | |
duke@435 | 90 | // We must keep the symbolOop used in the error alive. The constantPoolOop will |
duke@435 | 91 | // decide when the entry can be purged. |
duke@435 | 92 | void ResolutionErrorTable::always_strong_classes_do(OopClosure* blk) { |
duke@435 | 93 | for (int i = 0; i < table_size(); i++) { |
duke@435 | 94 | for (ResolutionErrorEntry* probe = bucket(i); |
duke@435 | 95 | probe != NULL; |
duke@435 | 96 | probe = probe->next()) { |
duke@435 | 97 | assert(probe->error() != (symbolOop)NULL, "resolution error table is corrupt"); |
duke@435 | 98 | blk->do_oop((oop*)probe->error_addr()); |
duke@435 | 99 | } |
duke@435 | 100 | } |
duke@435 | 101 | } |
duke@435 | 102 | |
duke@435 | 103 | // Remove unloaded entries from the table |
duke@435 | 104 | void ResolutionErrorTable::purge_resolution_errors(BoolObjectClosure* is_alive) { |
jcoomes@1844 | 105 | assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint"); |
duke@435 | 106 | for (int i = 0; i < table_size(); i++) { |
duke@435 | 107 | for (ResolutionErrorEntry** p = bucket_addr(i); *p != NULL; ) { |
duke@435 | 108 | ResolutionErrorEntry* entry = *p; |
duke@435 | 109 | assert(entry->pool() != (constantPoolOop)NULL, "resolution error table is corrupt"); |
duke@435 | 110 | constantPoolOop pool = entry->pool(); |
duke@435 | 111 | if (is_alive->do_object_b(pool)) { |
duke@435 | 112 | p = entry->next_addr(); |
duke@435 | 113 | } else { |
duke@435 | 114 | *p = entry->next(); |
duke@435 | 115 | free_entry(entry); |
duke@435 | 116 | } |
duke@435 | 117 | } |
duke@435 | 118 | } |
duke@435 | 119 | } |