OpenJDK / jdk / jdk
changeset 54783:3331dad9cb30
8223621: Move Universe usage out of oopRecorder.hpp
Reviewed-by: coleenp, lkorinth
author | stefank |
---|---|
date | Thu, 09 May 2019 14:26:03 +0200 |
parents | 095f10996dcf |
children | 31b27600b5db |
files | src/hotspot/share/asm/codeBuffer.cpp src/hotspot/share/code/oopRecorder.cpp src/hotspot/share/code/oopRecorder.hpp src/hotspot/share/code/oopRecorder.inline.hpp |
diffstat | 4 files changed, 49 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/asm/codeBuffer.cpp Thu May 09 14:26:03 2019 +0200 +++ b/src/hotspot/share/asm/codeBuffer.cpp Thu May 09 14:26:03 2019 +0200 @@ -24,6 +24,7 @@ #include "precompiled.hpp" #include "asm/codeBuffer.hpp" +#include "code/oopRecorder.inline.hpp" #include "compiler/disassembler.hpp" #include "oops/methodData.hpp" #include "oops/oop.inline.hpp"
--- a/src/hotspot/share/code/oopRecorder.cpp Thu May 09 14:26:03 2019 +0200 +++ b/src/hotspot/share/code/oopRecorder.cpp Thu May 09 14:26:03 2019 +0200 @@ -26,7 +26,7 @@ #include "ci/ciEnv.hpp" #include "ci/ciInstance.hpp" #include "ci/ciMetadata.hpp" -#include "code/oopRecorder.hpp" +#include "code/oopRecorder.inline.hpp" #include "memory/allocation.inline.hpp" #include "oops/oop.inline.hpp" #include "runtime/jniHandles.inline.hpp"
--- a/src/hotspot/share/code/oopRecorder.hpp Thu May 09 14:26:03 2019 +0200 +++ b/src/hotspot/share/code/oopRecorder.hpp Thu May 09 14:26:03 2019 +0200 @@ -77,9 +77,7 @@ } // Helper function; returns false for NULL or Universe::non_oop_word(). - bool is_real(T h) { - return h != NULL && h != (T)Universe::non_oop_word(); - } + inline bool is_real(T h); // copy the generated table to nmethod void copy_values_to(nmethod* nm); @@ -207,9 +205,7 @@ int oop_count() { return _oops.count(); } - bool is_real(jobject h) { - return _oops.is_real(h); - } + inline bool is_real(jobject h); int allocate_metadata_index(Metadata* oop) { return _metadata.allocate_index(oop); @@ -226,9 +222,7 @@ int metadata_count() { return _metadata.count(); } - bool is_real(Metadata* h) { - return _metadata.is_real(h); - } + inline bool is_real(Metadata* h); bool is_unused() { return _oops.is_unused() && _metadata.is_unused();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hotspot/share/code/oopRecorder.inline.hpp Thu May 09 14:26:03 2019 +0200 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2019, 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. + * + */ + +#ifndef SHARE_CODE_OOPRECORDER_INLINE_HPP +#define SHARE_CODE_OOPRECORDER_INLINE_HPP + +#include "code/oopRecorder.hpp" +#include "memory/universe.hpp" + +template <class T> +bool ValueRecorder<T>::is_real(T h) { + return h != NULL && h != (T)Universe::non_oop_word(); +} + +bool OopRecorder::is_real(jobject h) { + return _oops.is_real(h); +} + +bool OopRecorder::is_real(Metadata* h) { + return _metadata.is_real(h); +} + +#endif // SHARE_CODE_OOPRECORDER_INLINE_HPP