[RISCV][ASAN] updated platform macros to simplify detection of RISCV64 platform

[EccoTheDolphin]

Summary

[2/11] patch series to port ASAN for riscv64

Depends On D87997

[EccoTheDolphin]

addressing comments, changing the order of modifications

[eugenis]

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

222

Nit: Unnecessary braces around the expression.

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

102

remove "defined"

[EccoTheDolphin]

addressing comments

[vitalybuka]

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

226

Please just apply clang-format if it conflicts with old code.

[EccoTheDolphin]

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

226

Please just apply clang-format if it conflicts with old code.

Just to double-check...

clang-format does indeed complain. I was under impression that it's better to keep the code style consistent with the existing codebase.

Is it not the case and the current policy is just to follow clang-format suggestions?

[vitalybuka]

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

226

Please just apply clang-format if it conflicts with old code.

Just to double-check...

clang-format does indeed complain. I was under impression that it's better to keep the code style consistent with the existing codebase.

That's true if it does not conflicts with automation. It's not worth of this noise on code review and periodic hassle to undo of local clang-format results.
Just make sure to use corresponding .clang-format file and not a particular --style

Is it not the case and the current policy is just to follow clang-format suggestions?

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

 //===-- sanitizer_platform.h ------------------------------------*- C++ -*-===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 //
 // Common platform macros.

 #endif
 
 #if defined(__myriad2__)
 # define SANITIZER_MYRIAD2 1
 #else
 # define SANITIZER_MYRIAD2 0
 #endif
 
+#if defined(__riscv) && (__riscv_xlen == 64)
+# define SANITIZER_RISCV64 1
+#else
+# define SANITIZER_RISCV64 0
+#endif
+
 // By default we allow to use SizeClassAllocator64 on 64-bit platform.
 // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
 // does not work well and we need to fallback to SizeClassAllocator32.
 // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or
 // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.
 #ifndef SANITIZER_CAN_USE_ALLOCATOR64
 # if (SANITIZER_ANDROID && defined(__aarch64__)) || SANITIZER_FUCHSIA
 #  define SANITIZER_CAN_USE_ALLOCATOR64 1

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

 #elif defined(__sparc__) && defined(__arch64__)
 const unsigned struct___old_kernel_stat_sz = 0;
 const unsigned struct_kernel_stat_sz = 104;
 const unsigned struct_kernel_stat64_sz = 144;
 #elif defined(__sparc__) && !defined(__arch64__)
 const unsigned struct___old_kernel_stat_sz = 0;
 const unsigned struct_kernel_stat_sz = 64;
 const unsigned struct_kernel_stat64_sz = 104;
-#elif defined(__riscv) && __riscv_xlen == 64
+#elif SANITIZER_RISCV64
 const unsigned struct_kernel_stat_sz = 128;
 const unsigned struct_kernel_stat64_sz = 104;
 #endif
 struct __sanitizer_perf_event_attr {
   unsigned type;
   unsigned size;
   // More fields that vary with the kernel version.
 };

compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp

#if SANITIZER_LINUX
   unsigned struct_timespec_sz = sizeof(struct timespec);
   unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
   unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
 #endif // SANITIZER_LINUX
 
 #if SANITIZER_LINUX && !SANITIZER_ANDROID
   // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
   // has been removed from glibc 2.28.
-#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
-  || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
-  || defined(__x86_64__) || (defined(__riscv) && __riscv_xlen == 64)
+#if defined(__aarch64__) || defined(__s390x__) || defined(__mips64) ||     \
+    defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) || \
+    defined(__x86_64__) || SANITIZER_RISCV64
 #define SIZEOF_STRUCT_USTAT 32
 #elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
   || defined(__powerpc__) || defined(__s390__) || defined(__sparc__)
 #define SIZEOF_STRUCT_USTAT 20
 #else
 #error Unknown size of struct ustat
 #endif
   unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;