Skip to content

Commit 31eba31

Browse files
committed
8286660: codestrings gtest fails on AArch64: "udf" in padding
Backport-of: 63cace759ee0a913536171d1e498decb517cc71a
1 parent b498b44 commit 31eba31

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

test/hotspot/gtest/code/test_codestrings.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ static const char* replace_addr_expr(const char* str)
4242
std::basic_string<char> tmp1 = std::regex_replace(str, std::regex("0x[0-9a-fA-F]+"), "<addr>");
4343
// Padding: aarch64
4444
std::basic_string<char> tmp2 = std::regex_replace(tmp1, std::regex("\\s+<addr>:\\s+\\.inst\\t<addr> ; undefined"), "");
45+
std::basic_string<char> tmp3 = std::regex_replace(tmp2, std::regex("\\s+<addr>:\\s+udf\\t#0"), "");
4546
// Padding: x64
46-
std::basic_string<char> red = std::regex_replace(tmp2, std::regex("\\s+<addr>:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), "");
47+
std::basic_string<char> red = std::regex_replace(tmp3, std::regex("\\s+<addr>:\\s+hlt[ \\t]+(?!\\n\\s+;;)"), "");
4748

4849
return os::strdup(red.c_str());
4950
}

0 commit comments

Comments
 (0)