();
- typedef typename Decay::type DecayedP;
- typedef typename Decay::type DecayedT;
+ using DecayedP = std::decay_t;
+ using DecayedT = std::decay_t;
DecayedT decayed_value = value;
// If a volatile address is passed in but no memory ordering decorator,
// set the memory ordering to MO_RELAXED by default.
const DecoratorSet expanded_decorators = DecoratorFixup<
- (IsVolatile::value && !HasDecorator::value) ?
+ (std::is_volatile::value && !HasDecorator::value) ?
(MO_RELAXED | decorators) : decorators>::value;
store_reduce_types(const_cast(addr), decayed_value);
}
@@ -1102,7 +1095,7 @@ namespace AccessInternal {
template
inline void store_at(oop base, ptrdiff_t offset, T value) {
verify_types();
- typedef typename Decay::type DecayedT;
+ using DecayedT = std::decay_t;
DecayedT decayed_value = value;
const DecoratorSet expanded_decorators = DecoratorFixup::value ?
@@ -1113,14 +1106,14 @@ namespace AccessInternal {
template
inline T load(P* addr) {
verify_types();
- typedef typename Decay::type DecayedP;
- typedef typename Conditional::value,
- typename OopOrNarrowOop::type,
- typename Decay::type>::type DecayedT;
+ using DecayedP = std::decay_t;
+ using DecayedT = std::conditional_t::value,
+ typename OopOrNarrowOop::type,
+ std::decay_t>;
// If a volatile address is passed in but no memory ordering decorator,
// set the memory ordering to MO_RELAXED by default.
const DecoratorSet expanded_decorators = DecoratorFixup<
- (IsVolatile::value && !HasDecorator::value) ?
+ (std::is_volatile::value && !HasDecorator::value) ?
(MO_RELAXED | decorators) : decorators>::value;
return load_reduce_types(const_cast(addr));
}
@@ -1128,9 +1121,9 @@ namespace AccessInternal {
template
inline T load_at(oop base, ptrdiff_t offset) {
verify_types();
- typedef typename Conditional::value,
- typename OopOrNarrowOop::type,
- typename Decay::type>::type DecayedT;
+ using DecayedT = std::conditional_t::value,
+ typename OopOrNarrowOop::type,
+ std::decay_t>;
// Expand the decorators (figure out sensible defaults)
// Potentially remember if we need compressed oop awareness
const DecoratorSet expanded_decorators = DecoratorFixup
inline T atomic_cmpxchg(P* addr, T compare_value, T new_value) {
verify_types();
- typedef typename Decay::type DecayedP;
- typedef typename Decay::type DecayedT;
+ using DecayedP = std::decay_t;
+ using DecayedT = std::decay_t;
DecayedT new_decayed_value = new_value;
DecayedT compare_decayed_value = compare_value;
const DecoratorSet expanded_decorators = DecoratorFixup<
@@ -1157,7 +1150,7 @@ namespace AccessInternal {
template
inline T atomic_cmpxchg_at(oop base, ptrdiff_t offset, T compare_value, T new_value) {
verify_types();
- typedef typename Decay::type DecayedT;
+ using DecayedT = std::decay_t;
DecayedT new_decayed_value = new_value;
DecayedT compare_decayed_value = compare_value;
// Determine default memory ordering
@@ -1175,8 +1168,8 @@ namespace AccessInternal {
template
inline T atomic_xchg(P* addr, T new_value) {
verify_types();
- typedef typename Decay::type DecayedP;
- typedef typename Decay::type DecayedT;
+ using DecayedP = std::decay_t;
+ using DecayedT = std::decay_t;
DecayedT new_decayed_value = new_value;
// atomic_xchg is only available in SEQ_CST flavour.
const DecoratorSet expanded_decorators = DecoratorFixup::value;
@@ -1187,7 +1180,7 @@ namespace AccessInternal {
template
inline T atomic_xchg_at(oop base, ptrdiff_t offset, T new_value) {
verify_types();
- typedef typename Decay::type DecayedT;
+ using DecayedT = std::decay_t;
DecayedT new_decayed_value = new_value;
// atomic_xchg is only available in SEQ_CST flavour.
const DecoratorSet expanded_decorators = DecoratorFixup::value ||
- (IsSame::value || IsIntegral::value) ||
- IsFloatingPoint::value)); // arraycopy allows type erased void elements
- typedef typename Decay::type DecayedT;
+ (std::is_same::value || std::is_integral::value) ||
+ std::is_floating_point::value)); // arraycopy allows type erased void elements
+ using DecayedT = std::decay_t;
const DecoratorSet expanded_decorators = DecoratorFixup::value;
return arraycopy_reduce_types(src_obj, src_offset_in_bytes, const_cast(src_raw),
dst_obj, dst_offset_in_bytes, const_cast(dst_raw),
diff --git a/src/hotspot/share/oops/accessBackend.inline.hpp b/src/hotspot/share/oops/accessBackend.inline.hpp
index 1dacb48427f..677af8115c3 100644
--- a/src/hotspot/share/oops/accessBackend.inline.hpp
+++ b/src/hotspot/share/oops/accessBackend.inline.hpp
@@ -34,6 +34,8 @@
#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
+#include
+
template
template
inline typename EnableIf<
@@ -251,7 +253,7 @@ RawAccessBarrier::atomic_cmpxchg_maybe_locked(void* addr, T compare_value, T
}
class RawAccessBarrierArrayCopy: public AllStatic {
- template struct IsHeapWordSized: public IntegralConstant { };
+ template struct IsHeapWordSized: public std::integral_constant { };
public:
template
static inline typename EnableIf<
@@ -334,7 +336,7 @@ class RawAccessBarrierArrayCopy: public AllStatic {
}
};
-template<> struct RawAccessBarrierArrayCopy::IsHeapWordSized: public IntegralConstant { };
+template<> struct RawAccessBarrierArrayCopy::IsHeapWordSized: public std::false_type { };
template
template
diff --git a/src/hotspot/share/oops/accessDecorators.hpp b/src/hotspot/share/oops/accessDecorators.hpp
index 21bcff9113d..f7a3462f59a 100644
--- a/src/hotspot/share/oops/accessDecorators.hpp
+++ b/src/hotspot/share/oops/accessDecorators.hpp
@@ -27,9 +27,10 @@
#include "gc/shared/barrierSetConfig.hpp"
#include "memory/allocation.hpp"
-#include "metaprogramming/integralConstant.hpp"
#include "utilities/globalDefinitions.hpp"
+#include
+
// A decorator is an attribute or property that affects the way a memory access is performed in some way.
// There are different groups of decorators. Some have to do with memory ordering, others to do with,
// e.g. strength of references, strength of GC barriers, or whether compression should be applied or not.
@@ -41,7 +42,7 @@ typedef uint64_t DecoratorSet;
// The HasDecorator trait can help at compile-time determining whether a decorator set
// has an intersection with a certain other decorator set
template
-struct HasDecorator: public IntegralConstant {};
+struct HasDecorator: public std::integral_constant {};
// == General Decorators ==
// * DECORATORS_NONE: This is the name for the empty decorator set (in absence of other decorators).
diff --git a/src/hotspot/share/oops/generateOopMap.cpp b/src/hotspot/share/oops/generateOopMap.cpp
index 631afa0d321..74d902c86f0 100644
--- a/src/hotspot/share/oops/generateOopMap.cpp
+++ b/src/hotspot/share/oops/generateOopMap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2023, 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
@@ -1732,7 +1732,7 @@ void GenerateOopMap::ppop(CellTypeState *out) {
}
void GenerateOopMap::ppush1(CellTypeState in) {
- assert(in.is_reference() | in.is_value(), "sanity check");
+ assert(in.is_reference() || in.is_value(), "sanity check");
push(in);
}
diff --git a/src/hotspot/share/oops/instanceKlass.cpp b/src/hotspot/share/oops/instanceKlass.cpp
index fdee66a8866..2e9a5125014 100644
--- a/src/hotspot/share/oops/instanceKlass.cpp
+++ b/src/hotspot/share/oops/instanceKlass.cpp
@@ -3941,18 +3941,18 @@ void InstanceKlass::set_init_state(ClassState state) {
// Globally, there is at least one previous version of a class to walk
// during class unloading, which is saved because old methods in the class
// are still running. Otherwise the previous version list is cleaned up.
-bool InstanceKlass::_has_previous_versions = false;
+bool InstanceKlass::_should_clean_previous_versions = false;
// Returns true if there are previous versions of a class for class
// unloading only. Also resets the flag to false. purge_previous_version
// will set the flag to true if there are any left, i.e., if there's any
// work to do for next time. This is to avoid the expensive code cache
// walk in CLDG::clean_deallocate_lists().
-bool InstanceKlass::has_previous_versions_and_reset() {
- bool ret = _has_previous_versions;
- log_trace(redefine, class, iklass, purge)("Class unloading: has_previous_versions = %s",
+bool InstanceKlass::should_clean_previous_versions_and_reset() {
+ bool ret = _should_clean_previous_versions;
+ log_trace(redefine, class, iklass, purge)("Class unloading: should_clean_previous_versions = %s",
ret ? "true" : "false");
- _has_previous_versions = false;
+ _should_clean_previous_versions = false;
return ret;
}
@@ -4027,12 +4027,17 @@ void InstanceKlass::purge_previous_version_list() {
version++;
continue;
} else {
- log_trace(redefine, class, iklass, purge)("previous version " INTPTR_FORMAT " is alive", p2i(pv_node));
assert(pvcp->pool_holder() != NULL, "Constant pool with no holder");
guarantee (!loader_data->is_unloading(), "unloaded classes can't be on the stack");
live_count++;
- // found a previous version for next time we do class unloading
- _has_previous_versions = true;
+ if (pvcp->is_shared()) {
+ // Shared previous versions can never be removed so no cleaning is needed.
+ log_trace(redefine, class, iklass, purge)("previous version " PTR_FORMAT " is shared", p2i(pv_node));
+ } else {
+ // Previous version alive, set that clean is needed for next time.
+ _should_clean_previous_versions = true;
+ log_trace(redefine, class, iklass, purge)("previous version " PTR_FORMAT " is alive", p2i(pv_node));
+ }
}
// next previous version
@@ -4132,13 +4137,19 @@ void InstanceKlass::add_previous_version(InstanceKlass* scratch_class,
return;
}
- // Add previous version if any methods are still running.
- // Set has_previous_version flag for processing during class unloading.
- _has_previous_versions = true;
- log_trace(redefine, class, iklass, add) ("scratch class added; one of its methods is on_stack.");
+ // Add previous version if any methods are still running or if this is
+ // a shared class which should never be removed.
assert(scratch_class->previous_versions() == NULL, "shouldn't have a previous version");
scratch_class->link_previous_versions(previous_versions());
link_previous_versions(scratch_class);
+ if (cp_ref->is_shared()) {
+ log_trace(redefine, class, iklass, add) ("scratch class added; class is shared");
+ } else {
+ // We only set clean_previous_versions flag for processing during class
+ // unloading for non-shared classes.
+ _should_clean_previous_versions = true;
+ log_trace(redefine, class, iklass, add) ("scratch class added; one of its methods is on_stack.");
+ }
} // end add_previous_version()
#endif // INCLUDE_JVMTI
diff --git a/src/hotspot/share/oops/instanceKlass.hpp b/src/hotspot/share/oops/instanceKlass.hpp
index 23b773d0195..9f03bc50d48 100644
--- a/src/hotspot/share/oops/instanceKlass.hpp
+++ b/src/hotspot/share/oops/instanceKlass.hpp
@@ -815,7 +815,7 @@ class InstanceKlass: public Klass {
}
private:
- static bool _has_previous_versions;
+ static bool _should_clean_previous_versions;
public:
static void purge_previous_versions(InstanceKlass* ik) {
if (ik->has_been_redefined()) {
@@ -823,8 +823,8 @@ class InstanceKlass: public Klass {
}
}
- static bool has_previous_versions_and_reset();
- static bool has_previous_versions() { return _has_previous_versions; }
+ static bool should_clean_previous_versions_and_reset();
+ static bool should_clean_previous_versions() { return _should_clean_previous_versions; }
// JVMTI: Support for caching a class file before it is modified by an agent that can do retransformation
void set_cached_class_file(JvmtiCachedClassFileData *data) {
@@ -844,7 +844,7 @@ class InstanceKlass: public Klass {
#else // INCLUDE_JVMTI
static void purge_previous_versions(InstanceKlass* ik) { return; };
- static bool has_previous_versions_and_reset() { return false; }
+ static bool should_clean_previous_versions_and_reset() { return false; }
void set_cached_class_file(JvmtiCachedClassFileData *data) {
assert(data == NULL, "unexpected call with JVMTI disabled");
diff --git a/src/hotspot/share/oops/markWord.hpp b/src/hotspot/share/oops/markWord.hpp
index 797cd398093..a597f76a2e6 100644
--- a/src/hotspot/share/oops/markWord.hpp
+++ b/src/hotspot/share/oops/markWord.hpp
@@ -25,11 +25,12 @@
#ifndef SHARE_OOPS_MARKWORD_HPP
#define SHARE_OOPS_MARKWORD_HPP
-#include "metaprogramming/integralConstant.hpp"
#include "metaprogramming/primitiveConversions.hpp"
#include "oops/oopsHierarchy.hpp"
#include "runtime/globals.hpp"
+#include
+
// The markWord describes the header of an object.
//
// Bit-format of an object header (most significant first, big endian layout below):
@@ -356,7 +357,7 @@ class markWord {
// Support atomic operations.
template<>
-struct PrimitiveConversions::Translate