From: Blue Gaston Date: Thu, 22 Dec 2022 19:06:59 +0000 (-0500) Subject: [Sanitizers] Fix procmap tests for apple arm64 X-Git-Tag: upstream/17.0.6~22257 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3efb0274b7d90d675594a7a2735bdfed0a994fde;p=platform%2Fupstream%2Fllvm.git [Sanitizers] Fix procmap tests for apple arm64 As part of effort to enable sanitizer common unit tests on arm64 apple devices. Add kModuleArchARM64 as expected Arch Differential Revision: https://reviews.llvm.org/D140567 --- diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp b/compiler-rt/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp index 3201867..d4cc690 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_procmaps_test.cpp @@ -65,11 +65,11 @@ TEST(MemoryMapping, LoadedModuleArchAndUUID) { memory_mapping.DumpListOfModules(&modules); for (uptr i = 0; i < modules.size(); ++i) { ModuleArch arch = modules[i].arch(); - // Darwin unit tests are only run on i386/x86_64/x86_64h. + // Darwin unit tests are only run on i386/x86_64/x86_64h/arm64. if (SANITIZER_WORDSIZE == 32) { EXPECT_EQ(arch, kModuleArchI386); } else if (SANITIZER_WORDSIZE == 64) { - EXPECT_TRUE(arch == kModuleArchX86_64 || arch == kModuleArchX86_64H); + EXPECT_TRUE(arch == kModuleArchX86_64 || arch == kModuleArchX86_64H || kModuleArchARM64); } const u8 *uuid = modules[i].uuid(); u8 null_uuid[kModuleUUIDSize] = {0};