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) 2003, 2007, 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 PlaceholderEntry; |
duke@435 | 26 | |
duke@435 | 27 | // Placeholder objects. These represent classes currently |
duke@435 | 28 | // being loaded, as well as arrays of primitives. |
duke@435 | 29 | // |
duke@435 | 30 | |
duke@435 | 31 | class PlaceholderTable : public TwoOopHashtable { |
duke@435 | 32 | friend class VMStructs; |
duke@435 | 33 | |
duke@435 | 34 | public: |
duke@435 | 35 | PlaceholderTable(int table_size); |
duke@435 | 36 | |
duke@435 | 37 | PlaceholderEntry* new_entry(int hash, symbolOop name, oop loader, bool havesupername, symbolOop supername); |
duke@435 | 38 | |
duke@435 | 39 | PlaceholderEntry* bucket(int i) { |
duke@435 | 40 | return (PlaceholderEntry*)Hashtable::bucket(i); |
duke@435 | 41 | } |
duke@435 | 42 | |
duke@435 | 43 | PlaceholderEntry** bucket_addr(int i) { |
duke@435 | 44 | return (PlaceholderEntry**)Hashtable::bucket_addr(i); |
duke@435 | 45 | } |
duke@435 | 46 | |
duke@435 | 47 | void add_entry(int index, PlaceholderEntry* new_entry) { |
duke@435 | 48 | Hashtable::add_entry(index, (HashtableEntry*)new_entry); |
duke@435 | 49 | } |
duke@435 | 50 | |
duke@435 | 51 | void add_entry(int index, unsigned int hash, symbolHandle name, |
duke@435 | 52 | Handle loader, bool havesupername, symbolHandle supername); |
duke@435 | 53 | |
duke@435 | 54 | // This returns a symbolOop to match type for SystemDictionary |
duke@435 | 55 | symbolOop find_entry(int index, unsigned int hash, |
duke@435 | 56 | symbolHandle name, Handle loader); |
duke@435 | 57 | |
duke@435 | 58 | PlaceholderEntry* get_entry(int index, unsigned int hash, |
duke@435 | 59 | symbolHandle name, Handle loader); |
duke@435 | 60 | |
duke@435 | 61 | // caller to create a placeholder entry must enumerate an action |
duke@435 | 62 | // caller claims ownership of that action |
duke@435 | 63 | // For parallel classloading: |
duke@435 | 64 | // multiple LOAD_INSTANCE threads can proceed in parallel |
duke@435 | 65 | // multiple LOAD_SUPER threads can proceed in parallel |
duke@435 | 66 | // LOAD_SUPER needed to check for class circularity |
duke@435 | 67 | // DEFINE_CLASS: ultimately define class must be single threaded |
duke@435 | 68 | // on a class/classloader basis |
duke@435 | 69 | // so the head of that queue owns the token |
duke@435 | 70 | // and the rest of the threads return the result the first thread gets |
duke@435 | 71 | enum classloadAction { |
duke@435 | 72 | LOAD_INSTANCE = 1, // calling load_instance_class |
duke@435 | 73 | LOAD_SUPER = 2, // loading superclass for this class |
duke@435 | 74 | DEFINE_CLASS = 3 // find_or_define class |
duke@435 | 75 | }; |
duke@435 | 76 | |
duke@435 | 77 | // find_and_add returns probe pointer - old or new |
duke@435 | 78 | // If no entry exists, add a placeholder entry and push SeenThread |
duke@435 | 79 | // If entry exists, reuse entry and push SeenThread for classloadAction |
duke@435 | 80 | PlaceholderEntry* find_and_add(int index, unsigned int hash, |
duke@435 | 81 | symbolHandle name, Handle loader, |
duke@435 | 82 | classloadAction action, symbolHandle supername, |
duke@435 | 83 | Thread* thread); |
duke@435 | 84 | |
duke@435 | 85 | void remove_entry(int index, unsigned int hash, |
duke@435 | 86 | symbolHandle name, Handle loader); |
duke@435 | 87 | |
duke@435 | 88 | // Remove placeholder information |
duke@435 | 89 | void find_and_remove(int index, unsigned int hash, |
duke@435 | 90 | symbolHandle name, Handle loader, Thread* thread); |
duke@435 | 91 | |
duke@435 | 92 | // GC support. |
duke@435 | 93 | void oops_do(OopClosure* f); |
duke@435 | 94 | |
duke@435 | 95 | // JVMTI support |
duke@435 | 96 | void entries_do(void f(symbolOop, oop)); |
duke@435 | 97 | |
duke@435 | 98 | #ifndef PRODUCT |
duke@435 | 99 | void print(); |
duke@435 | 100 | #endif |
duke@435 | 101 | void verify(); |
duke@435 | 102 | }; |
duke@435 | 103 | |
duke@435 | 104 | // SeenThread objects represent list of threads that are |
duke@435 | 105 | // currently performing a load action on a class. |
duke@435 | 106 | // For class circularity, set before loading a superclass. |
duke@435 | 107 | // For bootclasssearchpath, set before calling load_instance_class. |
duke@435 | 108 | // Defining must be single threaded on a class/classloader basis |
duke@435 | 109 | // For DEFINE_CLASS, the head of the queue owns the |
duke@435 | 110 | // define token and the rest of the threads wait to return the |
duke@435 | 111 | // result the first thread gets. |
duke@435 | 112 | class SeenThread: public CHeapObj { |
duke@435 | 113 | private: |
duke@435 | 114 | Thread *_thread; |
duke@435 | 115 | SeenThread* _stnext; |
duke@435 | 116 | SeenThread* _stprev; |
duke@435 | 117 | public: |
duke@435 | 118 | SeenThread(Thread *thread) { |
duke@435 | 119 | _thread = thread; |
duke@435 | 120 | _stnext = NULL; |
duke@435 | 121 | _stprev = NULL; |
duke@435 | 122 | } |
duke@435 | 123 | Thread* thread() const { return _thread;} |
duke@435 | 124 | void set_thread(Thread *thread) { _thread = thread; } |
duke@435 | 125 | |
duke@435 | 126 | SeenThread* next() const { return _stnext;} |
duke@435 | 127 | void set_next(SeenThread *seen) { _stnext = seen; } |
duke@435 | 128 | void set_prev(SeenThread *seen) { _stprev = seen; } |
duke@435 | 129 | |
duke@435 | 130 | #ifndef PRODUCT |
duke@435 | 131 | void printActionQ() { |
duke@435 | 132 | SeenThread* seen = this; |
duke@435 | 133 | while (seen != NULL) { |
duke@435 | 134 | seen->thread()->print_value(); |
duke@435 | 135 | tty->print(", "); |
duke@435 | 136 | seen = seen->next(); |
duke@435 | 137 | } |
duke@435 | 138 | } |
duke@435 | 139 | #endif // PRODUCT |
duke@435 | 140 | }; |
duke@435 | 141 | |
duke@435 | 142 | // Placeholder objects represent classes currently being loaded. |
duke@435 | 143 | // All threads examining the placeholder table must hold the |
duke@435 | 144 | // SystemDictionary_lock, so we don't need special precautions |
duke@435 | 145 | // on store ordering here. |
duke@435 | 146 | // The system dictionary is the only user of this class. |
duke@435 | 147 | |
duke@435 | 148 | class PlaceholderEntry : public HashtableEntry { |
duke@435 | 149 | friend class VMStructs; |
duke@435 | 150 | |
duke@435 | 151 | |
duke@435 | 152 | private: |
duke@435 | 153 | oop _loader; // initiating loader |
duke@435 | 154 | bool _havesupername; // distinguish between null supername, and unknown |
duke@435 | 155 | symbolOop _supername; |
duke@435 | 156 | Thread* _definer; // owner of define token |
duke@435 | 157 | klassOop _instanceKlass; // instanceKlass from successful define |
duke@435 | 158 | SeenThread* _superThreadQ; // doubly-linked queue of Threads loading a superclass for this class |
duke@435 | 159 | SeenThread* _loadInstanceThreadQ; // loadInstance thread |
duke@435 | 160 | // can be multiple threads if classloader object lock broken by application |
duke@435 | 161 | // or if classloader supports parallel classloading |
duke@435 | 162 | |
duke@435 | 163 | SeenThread* _defineThreadQ; // queue of Threads trying to define this class |
duke@435 | 164 | // including _definer |
duke@435 | 165 | // _definer owns token |
duke@435 | 166 | // queue waits for and returns results from _definer |
duke@435 | 167 | |
duke@435 | 168 | public: |
duke@435 | 169 | // Simple accessors, used only by SystemDictionary |
duke@435 | 170 | symbolOop klass() const { return (symbolOop)literal(); } |
duke@435 | 171 | symbolOop* klass_addr() { return (symbolOop*)literal_addr(); } |
duke@435 | 172 | |
duke@435 | 173 | oop loader() const { return _loader; } |
duke@435 | 174 | void set_loader(oop loader) { _loader = loader; } |
duke@435 | 175 | oop* loader_addr() { return &_loader; } |
duke@435 | 176 | |
duke@435 | 177 | bool havesupername() const { return _havesupername; } |
duke@435 | 178 | void set_havesupername(bool havesupername) { _havesupername = havesupername; } |
duke@435 | 179 | |
duke@435 | 180 | symbolOop supername() const { return _supername; } |
duke@435 | 181 | void set_supername(symbolOop supername) { _supername = supername; } |
duke@435 | 182 | symbolOop* supername_addr() { return &_supername; } |
duke@435 | 183 | |
duke@435 | 184 | Thread* definer() const {return _definer; } |
duke@435 | 185 | void set_definer(Thread* definer) { _definer = definer; } |
duke@435 | 186 | |
duke@435 | 187 | klassOop instanceKlass() const {return _instanceKlass; } |
duke@435 | 188 | void set_instanceKlass(klassOop instanceKlass) { _instanceKlass = instanceKlass; } |
duke@435 | 189 | klassOop* instanceKlass_addr() { return &_instanceKlass; } |
duke@435 | 190 | |
duke@435 | 191 | SeenThread* superThreadQ() const { return _superThreadQ; } |
duke@435 | 192 | void set_superThreadQ(SeenThread* SeenThread) { _superThreadQ = SeenThread; } |
duke@435 | 193 | |
duke@435 | 194 | SeenThread* loadInstanceThreadQ() const { return _loadInstanceThreadQ; } |
duke@435 | 195 | void set_loadInstanceThreadQ(SeenThread* SeenThread) { _loadInstanceThreadQ = SeenThread; } |
duke@435 | 196 | |
duke@435 | 197 | SeenThread* defineThreadQ() const { return _defineThreadQ; } |
duke@435 | 198 | void set_defineThreadQ(SeenThread* SeenThread) { _defineThreadQ = SeenThread; } |
duke@435 | 199 | |
duke@435 | 200 | PlaceholderEntry* next() const { |
duke@435 | 201 | return (PlaceholderEntry*)HashtableEntry::next(); |
duke@435 | 202 | } |
duke@435 | 203 | |
duke@435 | 204 | PlaceholderEntry** next_addr() { |
duke@435 | 205 | return (PlaceholderEntry**)HashtableEntry::next_addr(); |
duke@435 | 206 | } |
duke@435 | 207 | |
duke@435 | 208 | // Test for equality |
duke@435 | 209 | // Entries are unique for class/classloader name pair |
duke@435 | 210 | bool equals(symbolOop class_name, oop class_loader) const { |
duke@435 | 211 | return (klass() == class_name && loader() == class_loader); |
duke@435 | 212 | } |
duke@435 | 213 | |
duke@435 | 214 | SeenThread* actionToQueue(PlaceholderTable::classloadAction action) { |
duke@435 | 215 | SeenThread* queuehead; |
duke@435 | 216 | switch (action) { |
duke@435 | 217 | case PlaceholderTable::LOAD_INSTANCE: |
duke@435 | 218 | queuehead = _loadInstanceThreadQ; |
duke@435 | 219 | break; |
duke@435 | 220 | case PlaceholderTable::LOAD_SUPER: |
duke@435 | 221 | queuehead = _superThreadQ; |
duke@435 | 222 | break; |
duke@435 | 223 | case PlaceholderTable::DEFINE_CLASS: |
duke@435 | 224 | queuehead = _defineThreadQ; |
duke@435 | 225 | break; |
duke@435 | 226 | default: Unimplemented(); |
duke@435 | 227 | } |
duke@435 | 228 | return queuehead; |
duke@435 | 229 | } |
duke@435 | 230 | |
duke@435 | 231 | void set_threadQ(SeenThread* seenthread, PlaceholderTable::classloadAction action) { |
duke@435 | 232 | switch (action) { |
duke@435 | 233 | case PlaceholderTable::LOAD_INSTANCE: |
duke@435 | 234 | _loadInstanceThreadQ = seenthread; |
duke@435 | 235 | break; |
duke@435 | 236 | case PlaceholderTable::LOAD_SUPER: |
duke@435 | 237 | _superThreadQ = seenthread; |
duke@435 | 238 | break; |
duke@435 | 239 | case PlaceholderTable::DEFINE_CLASS: |
duke@435 | 240 | _defineThreadQ = seenthread; |
duke@435 | 241 | break; |
duke@435 | 242 | default: Unimplemented(); |
duke@435 | 243 | } |
duke@435 | 244 | return; |
duke@435 | 245 | } |
duke@435 | 246 | |
duke@435 | 247 | bool super_load_in_progress() { |
duke@435 | 248 | return (_superThreadQ != NULL); |
duke@435 | 249 | } |
duke@435 | 250 | |
duke@435 | 251 | bool instance_load_in_progress() { |
duke@435 | 252 | return (_loadInstanceThreadQ != NULL); |
duke@435 | 253 | } |
duke@435 | 254 | |
duke@435 | 255 | bool define_class_in_progress() { |
duke@435 | 256 | return (_defineThreadQ != NULL); |
duke@435 | 257 | } |
duke@435 | 258 | |
duke@435 | 259 | // Doubly-linked list of Threads per action for class/classloader pair |
duke@435 | 260 | // Class circularity support: links in thread before loading superclass |
duke@435 | 261 | // bootstrapsearchpath support: links in a thread before load_instance_class |
duke@435 | 262 | // definers: use as queue of define requestors, including owner of |
duke@435 | 263 | // define token. Appends for debugging of requestor order |
duke@435 | 264 | void add_seen_thread(Thread* thread, PlaceholderTable::classloadAction action) { |
duke@435 | 265 | assert_lock_strong(SystemDictionary_lock); |
duke@435 | 266 | SeenThread* threadEntry = new SeenThread(thread); |
duke@435 | 267 | SeenThread* seen = actionToQueue(action); |
duke@435 | 268 | |
duke@435 | 269 | if (seen == NULL) { |
duke@435 | 270 | set_threadQ(threadEntry, action); |
duke@435 | 271 | return; |
duke@435 | 272 | } |
duke@435 | 273 | SeenThread* next; |
duke@435 | 274 | while ((next = seen->next()) != NULL) { |
duke@435 | 275 | seen = next; |
duke@435 | 276 | } |
duke@435 | 277 | seen->set_next(threadEntry); |
duke@435 | 278 | threadEntry->set_prev(seen); |
duke@435 | 279 | return; |
duke@435 | 280 | } |
duke@435 | 281 | |
duke@435 | 282 | bool check_seen_thread(Thread* thread, PlaceholderTable::classloadAction action) { |
duke@435 | 283 | assert_lock_strong(SystemDictionary_lock); |
duke@435 | 284 | SeenThread* threadQ = actionToQueue(action); |
duke@435 | 285 | SeenThread* seen = threadQ; |
duke@435 | 286 | while (seen) { |
duke@435 | 287 | if (thread == seen->thread()) { |
duke@435 | 288 | return true; |
duke@435 | 289 | } |
duke@435 | 290 | seen = seen->next(); |
duke@435 | 291 | } |
duke@435 | 292 | return false; |
duke@435 | 293 | } |
duke@435 | 294 | |
duke@435 | 295 | // returns true if seenthreadQ is now empty |
duke@435 | 296 | // Note, caller must ensure probe still exists while holding |
duke@435 | 297 | // SystemDictionary_lock |
duke@435 | 298 | // ignores if cleanup has already been done |
duke@435 | 299 | // if found, deletes SeenThread |
duke@435 | 300 | bool remove_seen_thread(Thread* thread, PlaceholderTable::classloadAction action) { |
duke@435 | 301 | assert_lock_strong(SystemDictionary_lock); |
duke@435 | 302 | SeenThread* threadQ = actionToQueue(action); |
duke@435 | 303 | SeenThread* seen = threadQ; |
duke@435 | 304 | SeenThread* prev = NULL; |
duke@435 | 305 | while (seen) { |
duke@435 | 306 | if (thread == seen->thread()) { |
duke@435 | 307 | if (prev) { |
duke@435 | 308 | prev->set_next(seen->next()); |
duke@435 | 309 | } else { |
duke@435 | 310 | set_threadQ(seen->next(), action); |
duke@435 | 311 | } |
duke@435 | 312 | if (seen->next()) { |
duke@435 | 313 | seen->next()->set_prev(prev); |
duke@435 | 314 | } |
duke@435 | 315 | delete seen; |
duke@435 | 316 | break; |
duke@435 | 317 | } |
duke@435 | 318 | prev = seen; |
duke@435 | 319 | seen = seen->next(); |
duke@435 | 320 | } |
duke@435 | 321 | return (actionToQueue(action) == NULL); |
duke@435 | 322 | } |
duke@435 | 323 | |
duke@435 | 324 | // GC support |
duke@435 | 325 | // Applies "f->do_oop" to all root oops in the placeholder table. |
duke@435 | 326 | void oops_do(OopClosure* blk); |
duke@435 | 327 | |
duke@435 | 328 | // Print method doesn't append a cr |
duke@435 | 329 | void print() const PRODUCT_RETURN; |
duke@435 | 330 | void verify() const; |
duke@435 | 331 | }; |