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 | /* |
jrose@1934 | 2 | * Copyright (c) 1997, 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 | #include "precompiled.hpp" |
stefank@2314 | 26 | #include "memory/iterator.hpp" |
stefank@2314 | 27 | #include "oops/oop.inline.hpp" |
duke@435 | 28 | |
jmasa@1370 | 29 | #ifdef ASSERT |
jmasa@1370 | 30 | bool OopClosure::_must_remember_klasses = false; |
jmasa@1370 | 31 | #endif |
jmasa@1370 | 32 | |
duke@435 | 33 | void ObjectToOopClosure::do_object(oop obj) { |
duke@435 | 34 | obj->oop_iterate(_cl); |
duke@435 | 35 | } |
duke@435 | 36 | |
duke@435 | 37 | void VoidClosure::do_void() { |
duke@435 | 38 | ShouldNotCallThis(); |
duke@435 | 39 | } |
jmasa@1370 | 40 | |
jmasa@1370 | 41 | #ifdef ASSERT |
jmasa@1370 | 42 | bool OopClosure::must_remember_klasses() { |
jmasa@1370 | 43 | return _must_remember_klasses; |
jmasa@1370 | 44 | } |
jmasa@1370 | 45 | void OopClosure::set_must_remember_klasses(bool v) { |
jmasa@1370 | 46 | _must_remember_klasses = v; |
jmasa@1370 | 47 | } |
jmasa@1370 | 48 | #endif |
jmasa@1370 | 49 | |
jrose@1428 | 50 | |
jrose@1424 | 51 | MarkingCodeBlobClosure::MarkScope::MarkScope(bool activate) |
jrose@1424 | 52 | : _active(activate) |
jrose@1424 | 53 | { |
jrose@1424 | 54 | if (_active) nmethod::oops_do_marking_prologue(); |
jrose@1424 | 55 | } |
jrose@1424 | 56 | |
jrose@1424 | 57 | MarkingCodeBlobClosure::MarkScope::~MarkScope() { |
jrose@1424 | 58 | if (_active) nmethod::oops_do_marking_epilogue(); |
jrose@1424 | 59 | } |
jrose@1424 | 60 | |
jrose@1424 | 61 | void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) { |
twisti@1918 | 62 | nmethod* nm = cb->as_nmethod_or_null(); |
twisti@1918 | 63 | if (nm == NULL) return; |
jrose@1424 | 64 | if (!nm->test_set_oops_do_mark()) { |
jrose@1424 | 65 | NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, 1st visit\n")); |
jrose@1424 | 66 | do_newly_marked_nmethod(nm); |
jrose@1424 | 67 | } else { |
jrose@1424 | 68 | NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n")); |
jrose@1424 | 69 | } |
jrose@1424 | 70 | } |
jrose@1424 | 71 | |
jrose@1429 | 72 | void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) { |
jrose@1429 | 73 | nm->oops_do(_cl, /*do_strong_roots_only=*/ true); |
jrose@1424 | 74 | } |
jrose@1424 | 75 | |
jrose@1424 | 76 | void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { |
jrose@1424 | 77 | if (!_do_marking) { |
twisti@1918 | 78 | nmethod* nm = cb->as_nmethod_or_null(); |
twisti@1918 | 79 | NOT_PRODUCT(if (TraceScavenge && Verbose && nm != NULL) nm->print_on(tty, "oops_do, unmarked visit\n")); |
jrose@1424 | 80 | // This assert won't work, since there are lots of mini-passes |
jrose@1424 | 81 | // (mostly in debug mode) that co-exist with marking phases. |
jrose@1424 | 82 | //assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase"); |
twisti@1918 | 83 | if (nm != NULL) { |
twisti@1918 | 84 | nm->oops_do(_cl); |
twisti@1918 | 85 | } |
jrose@1424 | 86 | } else { |
jrose@1424 | 87 | MarkingCodeBlobClosure::do_code_blob(cb); |
jrose@1424 | 88 | } |
jrose@1424 | 89 | } |
jrose@1424 | 90 | |
jrose@1424 | 91 |