[asan] Add "arm64" into the list of 64-bit architectures

[kubamracek]

Summary

It looks like get_bits_for_arch doesn't recognize "arm64" as a 64-bit architecture, and it actually matches the "arm" regexp, which marks it as 32-bit. Let's fix that by matching the 64-bit list first and addin "arm64" into the list.

[delcypher]

The patch is general looks good. Just a minor nit and a potential idea for a different implementation.

Does this patch change which ASan tests get run on arm64?

test/asan/CMakeLists.txt

21

I wonder if we should avoid using MATCHES and use STREQUAL instead. This would require listing each supported architecture (i.e. all variants would need to be specified) explicitly. This would avoid accidentally matching architectures in the future. This would bloat the code a bit though.

This might also be a bit painful for architecture variants that are supported out of tree because they'd now have to patch this macro whereas before it "just worked".

23

The arm regex should probably be ^armv7

[kubamracek]

Does this patch change which ASan tests get run on arm64?

Yes. Anything that was marked REQUIRES: asan-64-bits wasn't being run on arm64, and that's clearly a mistake.

test/asan/CMakeLists.txt

21

Generally, I agree, but I don't want to do it in this patch. Right now, let's just fix the obvious mistake of matching "arm64" and "mips64" as 32-bit architectures.

[kubamracek]

test/asan/CMakeLists.txt

23

There's also armv6 and probably other arm variants. Let's keep this as "arm" to avoid breaking others.

[delcypher]

test/asan/CMakeLists.txt

21

Sure.

23

I think the ^armv6 and ^armv7 regexes would capture all those variants but I won't insist on this.

test/asan/CMakeLists.txt

if(OS_NAME MATCHES "Windows" AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND
   message(WARNING "Disabling ASan tests because they are unreliable on Windows 7 and earlier")
 endif()
 
 if (SHADOW_MAPPING_UNRELIABLE)
   set(EXCLUDE_FROM_ALL TRUE)
 endif()
 
 macro(get_bits_for_arch arch bits)
-  if (${arch} MATCHES "i386|arm|mips|mipsel")
-    set(${bits} 32)
-  elseif (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|mips64|mips64el|s390x")
+  if (${arch} MATCHES "x86_64|powerpc64|powerpc64le|aarch64|arm64|mips64|mips64el|s390x")
     set(${bits} 64)
+  elseif (${arch} MATCHES "i386|arm|mips|mipsel")
+    set(${bits} 32)
   else()
     message(FATAL_ERROR "Unknown target architecture: ${arch}")
   endif()
 endmacro()
 
 set(ASAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS})
 if(NOT COMPILER_RT_STANDALONE_BUILD)
   list(APPEND ASAN_TEST_DEPS asan)