From 7dbd03388eef9cddbab6a622338b00ce250be3dc Mon Sep 17 00:00:00 2001 From: SendaoYan Date: Wed, 5 Jun 2024 05:09:53 +0000 Subject: [PATCH] 8332499: Gtest codestrings.validate_vm fail on linux x64 when hsdis is present Reviewed-by: thartmann, chagedorn --- test/hotspot/gtest/code/test_codestrings.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/hotspot/gtest/code/test_codestrings.cpp b/test/hotspot/gtest/code/test_codestrings.cpp index bd25da76208..fcd14b3b9b2 100644 --- a/test/hotspot/gtest/code/test_codestrings.cpp +++ b/test/hotspot/gtest/code/test_codestrings.cpp @@ -49,7 +49,8 @@ static const char* replace_addr_expr(const char* str) // Padding: riscv std::basic_string tmp4 = std::regex_replace(tmp3, std::regex("\\s+:\\s+unimp"), ""); // Padding: x64 - std::basic_string red = std::regex_replace(tmp4, std::regex("\\s+:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), ""); + std::basic_string tmp5 = std::regex_replace(tmp4, std::regex("\\s+:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), ""); + std::basic_string red = std::regex_replace(tmp5, std::regex("(\\s+:\\s+nop)[ \\t]*"), "$1"); return os::strdup(red.c_str()); }