return res
#define OPERATOR_NEW_ALIGN_BODY(nothrow) \
GET_MALLOC_STACK_TRACE; \
- void *res = hwasan_aligned_alloc(static_cast<uptr>(align), size, &stack); \
+ void *res = hwasan_memalign(static_cast<uptr>(align), size, &stack); \
if (!nothrow && UNLIKELY(!res)) \
ReportOutOfMemory(size, &stack); \
return res
// Test basic new functionality.
-// RUN: %clangxx_hwasan %s -o %t
+// RUN: %clangxx_hwasan -std=c++17 %s -o %t
// RUN: %run %t
-#include <stdlib.h>
-#include <assert.h>
-#include <sanitizer/hwasan_interface.h>
+#include <cassert>
+#include <cstdint>
+#include <cstdlib>
+#include <new>
#include <sanitizer/allocator_interface.h>
+#include <sanitizer/hwasan_interface.h>
int main() {
__hwasan_enable_allocator_tagging();
assert(a1 != nullptr);
assert(__sanitizer_get_allocated_size(a1) == 0);
delete[] a1;
+
+ // Aligned new/delete
+ constexpr auto kAlign = std::align_val_t{8};
+ void *a2 = ::operator new(4, kAlign);
+ assert(a2 != nullptr);
+ assert(reinterpret_cast<uintptr_t>(a2) % static_cast<uintptr_t>(kAlign) == 0);
+ assert(__sanitizer_get_allocated_size(a2) >= 4);
+ ::operator delete(a2, kAlign);
}