8332499: Gtest codestrings.validate_vm fail on linux x64 when hsdis is present

Backport-of: 7dbd03388e
This commit is contained in:
SendaoYan
2024-06-06 08:13:27 +00:00
committed by Vitaly Provodin
parent 786769285f
commit a45813b6be

View File

@@ -49,7 +49,8 @@ static const char* replace_addr_expr(const char* str)
// Padding: riscv
std::basic_string<char> tmp4 = std::regex_replace(tmp3, std::regex("\\s+<addr>:\\s+unimp"), "");
// Padding: x64
std::basic_string<char> red = std::regex_replace(tmp4, std::regex("\\s+<addr>:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), "");
std::basic_string<char> tmp5 = std::regex_replace(tmp4, std::regex("\\s+<addr>:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), "");
std::basic_string<char> red = std::regex_replace(tmp5, std::regex("(\\s+<addr>:\\s+nop)[ \\t]*"), "$1");
return os::strdup(red.c_str());
}