[HWASan] Add "N" suffix to generic __hwasan_load/store.

[alekseyshl]

Summary

"N" suffix is added by the instrumentation and interface functions
are expected to be exported from the library as hwasan_loadN* and
hwasan_storeN*.

[eugenis]

Add a test, please.

[alekseyshl]

• Add a test

[eugenis]

Thanks!

compiler-rt/trunk/lib/hwasan/hwasan.cc

__attribute__((always_inline, nodebug)) static void CheckAddressSized(uptr p,
   for (tag_t *t = shadow_first; t <= shadow_last; ++t)
     if (UNLIKELY(ptr_tag != *t)) {
       SigTrap<0x20 * (EA == ErrorAction::Recover) +
              0x10 * (AT == AccessType::Store) + 0xf>(p);
       if (EA == ErrorAction::Abort) __builtin_unreachable();
     }
 }
 
-void __hwasan_load(uptr p, uptr sz) {
+void __hwasan_loadN(uptr p, uptr sz) {
   CheckAddressSized<ErrorAction::Abort, AccessType::Load>(p, sz);
 }
 void __hwasan_load1(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Load, 0>(p);
 }
 void __hwasan_load2(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Load, 1>(p);
 }
 void __hwasan_load4(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Load, 2>(p);
 }
 void __hwasan_load8(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Load, 3>(p);
 }
 void __hwasan_load16(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Load, 4>(p);
 }
 
-void __hwasan_load_noabort(uptr p, uptr sz) {
+void __hwasan_loadN_noabort(uptr p, uptr sz) {
   CheckAddressSized<ErrorAction::Recover, AccessType::Load>(p, sz);
 }
 void __hwasan_load1_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Load, 0>(p);
 }
 void __hwasan_load2_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Load, 1>(p);
 }
 void __hwasan_load4_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Load, 2>(p);
 }
 void __hwasan_load8_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Load, 3>(p);
 }
 void __hwasan_load16_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Load, 4>(p);
 }
 
-void __hwasan_store(uptr p, uptr sz) {
+void __hwasan_storeN(uptr p, uptr sz) {
   CheckAddressSized<ErrorAction::Abort, AccessType::Store>(p, sz);
 }
 void __hwasan_store1(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Store, 0>(p);
 }
 void __hwasan_store2(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Store, 1>(p);
 }
 void __hwasan_store4(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Store, 2>(p);
 }
 void __hwasan_store8(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Store, 3>(p);
 }
 void __hwasan_store16(uptr p) {
   CheckAddress<ErrorAction::Abort, AccessType::Store, 4>(p);
 }
 
-void __hwasan_store_noabort(uptr p, uptr sz) {
+void __hwasan_storeN_noabort(uptr p, uptr sz) {
   CheckAddressSized<ErrorAction::Recover, AccessType::Store>(p, sz);
 }
 void __hwasan_store1_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Store, 0>(p);
 }
 void __hwasan_store2_noabort(uptr p) {
   CheckAddress<ErrorAction::Recover, AccessType::Store, 1>(p);
 }

compiler-rt/trunk/lib/hwasan/hwasan_interface_internal.h

 using __sanitizer::uu32;
 using __sanitizer::uu16;
 using __sanitizer::u64;
 using __sanitizer::u32;
 using __sanitizer::u16;
 using __sanitizer::u8;
 
 SANITIZER_INTERFACE_ATTRIBUTE
-void __hwasan_load(uptr, uptr);
+void __hwasan_loadN(uptr, uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load1(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load2(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load4(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load8(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load16(uptr);
 
 SANITIZER_INTERFACE_ATTRIBUTE
-void __hwasan_load_noabort(uptr, uptr);
+void __hwasan_loadN_noabort(uptr, uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load1_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load2_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load4_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load8_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_load16_noabort(uptr);
 
 SANITIZER_INTERFACE_ATTRIBUTE
-void __hwasan_store(uptr, uptr);
+void __hwasan_storeN(uptr, uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store1(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store2(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store4(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store8(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store16(uptr);
 
 SANITIZER_INTERFACE_ATTRIBUTE
-void __hwasan_store_noabort(uptr, uptr);
+void __hwasan_storeN_noabort(uptr, uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store1_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store2_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store4_noabort(uptr);
 SANITIZER_INTERFACE_ATTRIBUTE
 void __hwasan_store8_noabort(uptr);

compiler-rt/trunk/test/hwasan/TestCases/check-interface.cc

+// RUN: %clangxx_hwasan -mllvm -hwasan-instrument-with-calls=1 -O0 %s -o %t
+// RUN: %clangxx_hwasan -mllvm -hwasan-instrument-with-calls=1 -O0 %s -o %t -fsanitize-recover=hwaddress
+
+// REQUIRES: stable-runtime
+
+// Utilizes all flavors of __hwasan_load/store interface functions to verify
+// that the instrumentation and the interface provided by HWASan do match.
+// In case of a discrepancy, this test fails to link.
+
+#include <sanitizer/hwasan_interface.h>
+
+#define F(T) void f_##T(T *a, T *b) { *a = *b; }
+
+F(uint8_t)
+F(uint16_t)
+F(uint32_t)
+F(uint64_t)
+
+typedef unsigned V32 __attribute__((__vector_size__(32)));
+F(V32)
+
+int main() {}