From eedf3d616ee3b8a90cfdbb10ec4a641a606caa7b Mon Sep 17 00:00:00 2001 From: duke Date: Tue, 15 Jul 2025 10:06:25 +0000 Subject: [PATCH 1/3] Backport 809488bf38c250db3c263f200e5eb1a269059c3d --- test/hotspot/gtest/code/test_codestrings.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp index fb45c36c5f2..006dbb19447 100644 --- a/test/hotspot/gtest/code/test_codestrings.cpp +++ b/test/hotspot/gtest/code/test_codestrings.cpp @@ -25,6 +25,8 @@ #ifndef PRODUCT #ifndef ZERO +// Neither ppc nor s390 compilers use code strings. +#if !defined(PPC) && !defined(S390) #include "asm/macroAssembler.inline.hpp" #include "compiler/disassembler.hpp" @@ -259,5 +261,6 @@ TEST_VM(codestrings, validate) buffer_blob_test(); } +#endif // not S390 not PPC #endif // not ZERO #endif // not PRODUCT From 3f03161f776200a6fbc2da81fd5363961bd618d6 Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Tue, 15 Jul 2025 12:27:57 +0200 Subject: [PATCH 2/3] backport b889f2a88a5e182d2424b741d8fedf2c784442f1 --- test/hotspot/gtest/code/test_codestrings.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp index 006dbb19447..af724055908 100644 --- a/test/hotspot/gtest/code/test_codestrings.cpp +++ b/test/hotspot/gtest/code/test_codestrings.cpp @@ -25,8 +25,6 @@ #ifndef PRODUCT #ifndef ZERO -// Neither ppc nor s390 compilers use code strings. -#if !defined(PPC) && !defined(S390) #include "asm/macroAssembler.inline.hpp" #include "compiler/disassembler.hpp" @@ -255,12 +253,16 @@ static void buffer_blob_test() BufferBlob::free(blob); } +#if defined(PPC) || defined(S390) +// Neither ppc nor s390 compiler use code strings +TEST_VM(codestrings, DISABLED_validate) +#else TEST_VM(codestrings, validate) +#endif { code_buffer_test(); buffer_blob_test(); } -#endif // not S390 not PPC #endif // not ZERO #endif // not PRODUCT From 9cb3b0b45301f8828fa20dbdd25e240036a64b7e Mon Sep 17 00:00:00 2001 From: Goetz Lindenmaier Date: Thu, 17 Jul 2025 11:51:38 +0200 Subject: [PATCH 3/3] fix automatic resolve --- test/hotspot/gtest/code/test_codestrings.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp index 29f53e5ff14..c3774952f2d 100644 --- a/test/hotspot/gtest/code/test_codestrings.cpp +++ b/test/hotspot/gtest/code/test_codestrings.cpp @@ -25,8 +25,6 @@ #ifndef PRODUCT #ifndef ZERO -// Neither ppc nor s390 compilers use code strings. -#if !defined(PPC) && !defined(S390) #include "asm/macroAssembler.inline.hpp" #include "compiler/disassembler.hpp" @@ -270,6 +268,5 @@ TEST_VM(codestrings, validate) buffer_blob_test(); } -#endif // not S390 not PPC #endif // not ZERO #endif // not PRODUCT