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 | class ResolutionErrorEntry; |
duke@435 | 26 | |
duke@435 | 27 | // ResolutionError objects are used to record errors encountered during |
duke@435 | 28 | // constant pool resolution (JVMS 5.4.3). |
duke@435 | 29 | |
duke@435 | 30 | class ResolutionErrorTable : public Hashtable { |
duke@435 | 31 | |
duke@435 | 32 | public: |
duke@435 | 33 | ResolutionErrorTable(int table_size); |
duke@435 | 34 | |
duke@435 | 35 | ResolutionErrorEntry* new_entry(int hash, constantPoolOop pool, int cp_index, symbolOop error); |
duke@435 | 36 | |
duke@435 | 37 | ResolutionErrorEntry* bucket(int i) { |
duke@435 | 38 | return (ResolutionErrorEntry*)Hashtable::bucket(i); |
duke@435 | 39 | } |
duke@435 | 40 | |
duke@435 | 41 | ResolutionErrorEntry** bucket_addr(int i) { |
duke@435 | 42 | return (ResolutionErrorEntry**)Hashtable::bucket_addr(i); |
duke@435 | 43 | } |
duke@435 | 44 | |
duke@435 | 45 | void add_entry(int index, ResolutionErrorEntry* new_entry) { |
duke@435 | 46 | Hashtable::add_entry(index, (HashtableEntry*)new_entry); |
duke@435 | 47 | } |
duke@435 | 48 | |
duke@435 | 49 | void add_entry(int index, unsigned int hash, |
duke@435 | 50 | constantPoolHandle pool, int which, symbolHandle error); |
duke@435 | 51 | |
duke@435 | 52 | |
duke@435 | 53 | // find error given the constant pool and constant pool index |
duke@435 | 54 | ResolutionErrorEntry* find_entry(int index, unsigned int hash, |
duke@435 | 55 | constantPoolHandle pool, int cp_index); |
duke@435 | 56 | |
duke@435 | 57 | |
duke@435 | 58 | unsigned int compute_hash(constantPoolHandle pool, int cp_index) { |
duke@435 | 59 | return (unsigned int) pool->identity_hash() + cp_index; |
duke@435 | 60 | } |
duke@435 | 61 | |
duke@435 | 62 | // purges unloaded entries from the table |
duke@435 | 63 | void purge_resolution_errors(BoolObjectClosure* is_alive); |
duke@435 | 64 | |
duke@435 | 65 | // this table keeps symbolOops alive |
duke@435 | 66 | void always_strong_classes_do(OopClosure* blk); |
duke@435 | 67 | |
duke@435 | 68 | // GC support. |
duke@435 | 69 | void oops_do(OopClosure* f); |
duke@435 | 70 | }; |
duke@435 | 71 | |
duke@435 | 72 | |
duke@435 | 73 | class ResolutionErrorEntry : public HashtableEntry { |
duke@435 | 74 | private: |
duke@435 | 75 | int _cp_index; |
duke@435 | 76 | symbolOop _error; |
duke@435 | 77 | |
duke@435 | 78 | public: |
duke@435 | 79 | constantPoolOop pool() const { return (constantPoolOop)literal(); } |
duke@435 | 80 | constantPoolOop* pool_addr() { return (constantPoolOop*)literal_addr(); } |
duke@435 | 81 | |
duke@435 | 82 | int cp_index() const { return _cp_index; } |
duke@435 | 83 | void set_cp_index(int cp_index) { _cp_index = cp_index; } |
duke@435 | 84 | |
duke@435 | 85 | symbolOop error() const { return _error; } |
duke@435 | 86 | void set_error(symbolOop e) { _error = e; } |
duke@435 | 87 | symbolOop* error_addr() { return &_error; } |
duke@435 | 88 | |
duke@435 | 89 | ResolutionErrorEntry* next() const { |
duke@435 | 90 | return (ResolutionErrorEntry*)HashtableEntry::next(); |
duke@435 | 91 | } |
duke@435 | 92 | |
duke@435 | 93 | ResolutionErrorEntry** next_addr() { |
duke@435 | 94 | return (ResolutionErrorEntry**)HashtableEntry::next_addr(); |
duke@435 | 95 | } |
duke@435 | 96 | |
duke@435 | 97 | // GC support |
duke@435 | 98 | void oops_do(OopClosure* blk); |
duke@435 | 99 | }; |