Fri, 15 Apr 2011 09:36:28 -0400
7032407: Crash in LinkResolver::runtime_resolve_virtual_method()
Summary: Make CDS reorder vtables so that dump time vtables match run time order, so when redefine classes reinitializes them, they aren't in the wrong order.
Reviewed-by: dcubed, acorn
duke@435 | 1 | /* |
stefank@2314 | 2 | * Copyright (c) 2000, 2010, 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 | |
stefank@2314 | 25 | #ifndef SHARE_VM_MEMORY_SPACE_INLINE_HPP |
stefank@2314 | 26 | #define SHARE_VM_MEMORY_SPACE_INLINE_HPP |
stefank@2314 | 27 | |
stefank@2314 | 28 | #include "gc_interface/collectedHeap.hpp" |
stefank@2314 | 29 | #include "memory/space.hpp" |
stefank@2314 | 30 | #include "memory/universe.hpp" |
stefank@2314 | 31 | #include "runtime/safepoint.hpp" |
stefank@2314 | 32 | |
ysr@777 | 33 | inline HeapWord* Space::block_start(const void* p) { |
ysr@777 | 34 | return block_start_const(p); |
ysr@777 | 35 | } |
ysr@777 | 36 | |
duke@435 | 37 | inline HeapWord* OffsetTableContigSpace::allocate(size_t size) { |
duke@435 | 38 | HeapWord* res = ContiguousSpace::allocate(size); |
duke@435 | 39 | if (res != NULL) { |
duke@435 | 40 | _offsets.alloc_block(res, size); |
duke@435 | 41 | } |
duke@435 | 42 | return res; |
duke@435 | 43 | } |
duke@435 | 44 | |
duke@435 | 45 | // Because of the requirement of keeping "_offsets" up to date with the |
duke@435 | 46 | // allocations, we sequentialize these with a lock. Therefore, best if |
duke@435 | 47 | // this is used for larger LAB allocations only. |
duke@435 | 48 | inline HeapWord* OffsetTableContigSpace::par_allocate(size_t size) { |
duke@435 | 49 | MutexLocker x(&_par_alloc_lock); |
duke@435 | 50 | // This ought to be just "allocate", because of the lock above, but that |
duke@435 | 51 | // ContiguousSpace::allocate asserts that either the allocating thread |
duke@435 | 52 | // holds the heap lock or it is the VM thread and we're at a safepoint. |
duke@435 | 53 | // The best I (dld) could figure was to put a field in ContiguousSpace |
duke@435 | 54 | // meaning "locking at safepoint taken care of", and set/reset that |
duke@435 | 55 | // here. But this will do for now, especially in light of the comment |
duke@435 | 56 | // above. Perhaps in the future some lock-free manner of keeping the |
duke@435 | 57 | // coordination. |
duke@435 | 58 | HeapWord* res = ContiguousSpace::par_allocate(size); |
duke@435 | 59 | if (res != NULL) { |
duke@435 | 60 | _offsets.alloc_block(res, size); |
duke@435 | 61 | } |
duke@435 | 62 | return res; |
duke@435 | 63 | } |
duke@435 | 64 | |
ysr@777 | 65 | inline HeapWord* |
ysr@777 | 66 | OffsetTableContigSpace::block_start_const(const void* p) const { |
duke@435 | 67 | return _offsets.block_start(p); |
duke@435 | 68 | } |
duke@435 | 69 | |
duke@435 | 70 | inline HeapWord* ContiguousSpace::concurrent_iteration_safe_limit() |
duke@435 | 71 | { |
duke@435 | 72 | assert(_concurrent_iteration_safe_limit <= top(), |
duke@435 | 73 | "_concurrent_iteration_safe_limit update missed"); |
duke@435 | 74 | return _concurrent_iteration_safe_limit; |
duke@435 | 75 | } |
duke@435 | 76 | |
duke@435 | 77 | inline void ContiguousSpace::set_concurrent_iteration_safe_limit(HeapWord* new_limit) |
duke@435 | 78 | { |
duke@435 | 79 | assert(new_limit <= top(), "uninitialized objects in the safe range"); |
duke@435 | 80 | _concurrent_iteration_safe_limit = new_limit; |
duke@435 | 81 | } |
stefank@2314 | 82 | |
stefank@2314 | 83 | #endif // SHARE_VM_MEMORY_SPACE_INLINE_HPP |