From 913c973ca0ffdc19171a56550e8a8f03ac7f4771 Mon Sep 17 00:00:00 2001 From: Kim Barrett Date: Thu, 6 Nov 2025 10:14:21 +0000 Subject: [PATCH] 8371104: gtests should use wrappers for and Reviewed-by: jrose, tschatzl --- test/hotspot/gtest/metaprogramming/test_enableIf.cpp | 3 +-- test/hotspot/gtest/riscv/test_assembler_riscv.cpp | 3 +-- test/hotspot/gtest/utilities/test_align.cpp | 3 +-- test/hotspot/gtest/utilities/test_count_leading_zeros.cpp | 5 ++--- test/hotspot/gtest/utilities/test_deferredStatic.cpp | 3 +-- test/hotspot/gtest/utilities/test_enumIterator.cpp | 3 +-- test/hotspot/gtest/utilities/test_globalDefinitions.cpp | 3 +-- test/hotspot/gtest/utilities/test_population_count.cpp | 3 +-- test/hotspot/gtest/utilities/test_powerOfTwo.cpp | 5 ++--- 9 files changed, 11 insertions(+), 20 deletions(-) diff --git a/test/hotspot/gtest/metaprogramming/test_enableIf.cpp b/test/hotspot/gtest/metaprogramming/test_enableIf.cpp index 39073309704..05603f01c64 100644 --- a/test/hotspot/gtest/metaprogramming/test_enableIf.cpp +++ b/test/hotspot/gtest/metaprogramming/test_enableIf.cpp @@ -22,13 +22,12 @@ * */ +#include "cppstdlib/type_traits.hpp" #include "memory/allStatic.hpp" #include "metaprogramming/enableIf.hpp" #include "utilities/debug.hpp" #include "unittest.hpp" -#include - class EnableIfTest: AllStatic { class A: AllStatic { public: diff --git a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp index c6754eacae6..55504c34b0f 100644 --- a/test/hotspot/gtest/riscv/test_assembler_riscv.cpp +++ b/test/hotspot/gtest/riscv/test_assembler_riscv.cpp @@ -26,14 +26,13 @@ #include "asm/assembler.inline.hpp" #include "asm/macroAssembler.hpp" +#include "cppstdlib/limits.hpp" #include "memory/resourceArea.hpp" #include "metaprogramming/enableIf.hpp" #include "runtime/orderAccess.hpp" #include "threadHelper.inline.hpp" #include "unittest.hpp" -#include - typedef int64_t (*zicond_func)(int64_t cmp1, int64_t cmp2, int64_t dst, int64_t src); typedef void (MacroAssembler::*cmov_func)(Register cmp1, Register cmp2, Register dst, Register src); diff --git a/test/hotspot/gtest/utilities/test_align.cpp b/test/hotspot/gtest/utilities/test_align.cpp index 7413e58e7ab..3679a0b3e42 100644 --- a/test/hotspot/gtest/utilities/test_align.cpp +++ b/test/hotspot/gtest/utilities/test_align.cpp @@ -21,13 +21,12 @@ * questions. */ +#include "cppstdlib/limits.hpp" #include "utilities/align.hpp" #include "utilities/formatBuffer.hpp" #include "utilities/globalDefinitions.hpp" #include "unittest.hpp" -#include - // A few arbitrarily chosen values to test the align functions on. static constexpr uint64_t values[] = {1, 3, 10, 345, 1023, 1024, 1025, 23909034, INT_MAX, uint64_t(-1) / 2, uint64_t(-1) / 2 + 100, ~(uint64_t(1) << 62)}; diff --git a/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp b/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp index 4d5fcc09999..8d8f0a6f5e4 100644 --- a/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp +++ b/test/hotspot/gtest/utilities/test_count_leading_zeros.cpp @@ -22,13 +22,12 @@ * */ +#include "cppstdlib/limits.hpp" +#include "cppstdlib/type_traits.hpp" #include "utilities/count_leading_zeros.hpp" #include "utilities/globalDefinitions.hpp" #include "unittest.hpp" -#include -#include - template void one_or_two_set_bits() { uint32_t bit1_pos = 0; uint32_t bits = sizeof(T) * BitsPerByte; diff --git a/test/hotspot/gtest/utilities/test_deferredStatic.cpp b/test/hotspot/gtest/utilities/test_deferredStatic.cpp index b41b1e4ee60..779c0d08b2c 100644 --- a/test/hotspot/gtest/utilities/test_deferredStatic.cpp +++ b/test/hotspot/gtest/utilities/test_deferredStatic.cpp @@ -22,12 +22,11 @@ * */ +#include "cppstdlib/type_traits.hpp" #include "utilities/debug.hpp" #include "utilities/deferredStatic.hpp" #include "utilities/globalDefinitions.hpp" -#include - #include "unittest.hpp" class DeferredStaticTestClass { diff --git a/test/hotspot/gtest/utilities/test_enumIterator.cpp b/test/hotspot/gtest/utilities/test_enumIterator.cpp index 2506e85e3d3..429efff7ede 100644 --- a/test/hotspot/gtest/utilities/test_enumIterator.cpp +++ b/test/hotspot/gtest/utilities/test_enumIterator.cpp @@ -21,11 +21,10 @@ * questions. */ +#include "cppstdlib/type_traits.hpp" #include "utilities/enumIterator.hpp" #include "unittest.hpp" -#include - enum class ExplicitTest : int { value1, value2, value3 }; ENUMERATOR_RANGE(ExplicitTest, ExplicitTest::value1, ExplicitTest::value3); constexpr int explicit_start = 0; diff --git a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp index 4c04b77a51b..f24d74ea529 100644 --- a/test/hotspot/gtest/utilities/test_globalDefinitions.cpp +++ b/test/hotspot/gtest/utilities/test_globalDefinitions.cpp @@ -21,6 +21,7 @@ * questions. */ +#include "cppstdlib/type_traits.hpp" #include "memory/resourceArea.hpp" #include "runtime/os.hpp" #include "utilities/align.hpp" @@ -28,8 +29,6 @@ #include "utilities/ostream.hpp" #include "unittest.hpp" -#include - static ::testing::AssertionResult testPageAddress( const char* expected_addr_expr, const char* addr_expr, diff --git a/test/hotspot/gtest/utilities/test_population_count.cpp b/test/hotspot/gtest/utilities/test_population_count.cpp index 1cb7c87f434..8494d9b593e 100644 --- a/test/hotspot/gtest/utilities/test_population_count.cpp +++ b/test/hotspot/gtest/utilities/test_population_count.cpp @@ -22,14 +22,13 @@ * */ +#include "cppstdlib/limits.hpp" #include "runtime/os.hpp" #include "utilities/population_count.hpp" #include "utilities/powerOfTwo.hpp" #include "utilities/globalDefinitions.hpp" #include "unittest.hpp" -#include - #define BITS_IN_BYTE_ARRAY_SIZE 256 const uint8_t test_popcnt_bitsInByte[BITS_IN_BYTE_ARRAY_SIZE] = { diff --git a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp index a287036e6a0..9ead9952e73 100644 --- a/test/hotspot/gtest/utilities/test_powerOfTwo.cpp +++ b/test/hotspot/gtest/utilities/test_powerOfTwo.cpp @@ -22,13 +22,12 @@ */ +#include "cppstdlib/limits.hpp" +#include "cppstdlib/type_traits.hpp" #include "utilities/globalDefinitions.hpp" #include "utilities/powerOfTwo.hpp" #include "unittest.hpp" -#include -#include - struct StaticTestIsPowerOf2Result { uint64_t _value; int _status; // 0: success, > 0 indicates which failure case