8299398: Remove metaprogramming/isConst.hpp

Backport-of: d812022890815c33031905e7ec489b8729a45d90
openjdk · Jul 5, 2024 · 8b9d876 · 8b9d876 · openjdk-notifier · Jul 5, 2024
1 parent f87aa30
commit 8b9d876
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 82 deletions.
diff --git a/src/hotspot/share/gc/shared/oopStorage.inline.hpp b/src/hotspot/share/gc/shared/oopStorage.inline.hpp
@@ -29,14 +29,15 @@
 
 #include "memory/allocation.hpp"
 #include "metaprogramming/conditional.hpp"
-#include "metaprogramming/isConst.hpp"
 #include "oops/oop.hpp"
 #include "runtime/safepoint.hpp"
 #include "utilities/align.hpp"
 #include "utilities/count_trailing_zeros.hpp"
 #include "utilities/debug.hpp"
 #include "utilities/globalDefinitions.hpp"
 
+#include <type_traits>
+
 // Array of all active blocks.  Refcounted for lock-free reclaim of
 // old array when a new array is allocated for expansion.
 class OopStorage::ActiveArray {
@@ -361,7 +362,7 @@ inline bool OopStorage::iterate_impl(F f, Storage* storage) {
   assert_at_safepoint();
   // Propagate const/non-const iteration to the block layer, by using
   // const or non-const blocks as corresponding to Storage.
-  typedef typename Conditional<IsConst<Storage>::value, const Block*, Block*>::type BlockPtr;
+  typedef typename Conditional<std::is_const<Storage>::value, const Block*, Block*>::type BlockPtr;
   ActiveArray* blocks = storage->_active_array;
   size_t limit = blocks->block_count();
   for (size_t i = 0; i < limit; ++i) {

diff --git a/src/hotspot/share/metaprogramming/isConst.hpp b/src/hotspot/share/metaprogramming/isConst.hpp
diff --git a/test/hotspot/gtest/metaprogramming/test_isConst.cpp b/test/hotspot/gtest/metaprogramming/test_isConst.cpp