Mercurial > hg > graal-jvmci-8
view src/share/vm/memory/iterator.cpp @ 3293:1f4413413144
7039089: G1: changeset for 7037276 broke heap verification, and related cleanups
Summary: In G1 heap verification, we no longer scan perm to G1-collected heap refs as part of process_strong_roots() but rather in a separate explicit oop iteration over the perm gen. This preserves the original perm card-marks. Added a new assertion in younger_refs_iterate() to catch a simple subcase where the user may have forgotten a prior save_marks() call, as happened in the case of G1's attempt to iterate perm to G1 refs when verifying the heap before exit. The assert was deliberately weakened for ParNew+CMS and will be fixed for that combination in a future CR. Also made some (non-G1) cleanups related to code and comments obsoleted by the migration of Symbols to the native heap.
Reviewed-by: iveresov, jmasa, tonyp
author | ysr |
---|---|
date | Tue, 26 Apr 2011 21:17:24 -0700 |
parents | f95d63e2154a |
children | da91efe96a93 |
line wrap: on
line source
/* * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. * * This code is distributed in the hope that it will be useful, but WITHOUT * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * version 2 for more details (a copy is included in the LICENSE file that * accompanied this code). * * You should have received a copy of the GNU General Public License version * 2 along with this work; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. * * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA * or visit www.oracle.com if you need additional information or have any * questions. * */ #include "precompiled.hpp" #include "memory/iterator.hpp" #include "oops/oop.inline.hpp" #ifdef ASSERT bool OopClosure::_must_remember_klasses = false; #endif void ObjectToOopClosure::do_object(oop obj) { obj->oop_iterate(_cl); } void VoidClosure::do_void() { ShouldNotCallThis(); } #ifdef ASSERT bool OopClosure::must_remember_klasses() { return _must_remember_klasses; } void OopClosure::set_must_remember_klasses(bool v) { _must_remember_klasses = v; } #endif MarkingCodeBlobClosure::MarkScope::MarkScope(bool activate) : _active(activate) { if (_active) nmethod::oops_do_marking_prologue(); } MarkingCodeBlobClosure::MarkScope::~MarkScope() { if (_active) nmethod::oops_do_marking_epilogue(); } void MarkingCodeBlobClosure::do_code_blob(CodeBlob* cb) { nmethod* nm = cb->as_nmethod_or_null(); if (nm == NULL) return; if (!nm->test_set_oops_do_mark()) { NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, 1st visit\n")); do_newly_marked_nmethod(nm); } else { NOT_PRODUCT(if (TraceScavenge) nm->print_on(tty, "oops_do, skipped on 2nd visit\n")); } } void CodeBlobToOopClosure::do_newly_marked_nmethod(nmethod* nm) { nm->oops_do(_cl, /*do_strong_roots_only=*/ true); } void CodeBlobToOopClosure::do_code_blob(CodeBlob* cb) { if (!_do_marking) { nmethod* nm = cb->as_nmethod_or_null(); NOT_PRODUCT(if (TraceScavenge && Verbose && nm != NULL) nm->print_on(tty, "oops_do, unmarked visit\n")); // This assert won't work, since there are lots of mini-passes // (mostly in debug mode) that co-exist with marking phases. //assert(!(cb->is_nmethod() && ((nmethod*)cb)->test_oops_do_mark()), "found marked nmethod during mark-free phase"); if (nm != NULL) { nm->oops_do(_cl); } } else { MarkingCodeBlobClosure::do_code_blob(cb); } }