d44cb7a656
Summary: This is a redo of D63612. Two problems came up on some bots: - `__builtin_umull_overflow` was not declared. This is likely due to an older clang or gcc, so add a guard with `__has_builtin` and fallback to a division in the event the builtin doesn't exist; - contradicting definition for `malloc`, etc. This is AFAIU due to the fact that we ended up transitively including `stdlib.h` in the `.inc` due to it being the flags parser header: so move the include to the cc instead. This should fix the issues, but since those didn't come up in my local tests it's mostly guesswork. Rest is the same! Reviewers: morehouse, hctim, eugenis, vitalybuka, dyung, hans Reviewed By: morehouse, dyung, hans Subscribers: srhines, mgorny, delcypher, jfb, #sanitizers, llvm-commits Tags: #llvm, #sanitizers Differential Revision: https://reviews.llvm.org/D63831 llvm-svn: 364547
108 lines
4.6 KiB
C++
108 lines
4.6 KiB
C++
//===-- wrappers_cpp.cc -----------------------------------------*- 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
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "platform.h"
|
|
|
|
// Skip this compilation unit if compiled as part of Bionic.
|
|
#if !SCUDO_ANDROID || !_BIONIC
|
|
|
|
#include "allocator_config.h"
|
|
|
|
#include <stdint.h>
|
|
|
|
extern scudo::Allocator<scudo::Config> *AllocatorPtr;
|
|
|
|
namespace std {
|
|
struct nothrow_t {};
|
|
enum class align_val_t : size_t {};
|
|
} // namespace std
|
|
|
|
INTERFACE WEAK void *operator new(size_t size) {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::New);
|
|
}
|
|
INTERFACE WEAK void *operator new[](size_t size) {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::NewArray);
|
|
}
|
|
INTERFACE WEAK void *operator new(size_t size,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::New);
|
|
}
|
|
INTERFACE WEAK void *operator new[](size_t size,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::NewArray);
|
|
}
|
|
INTERFACE WEAK void *operator new(size_t size, std::align_val_t align) {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::New,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align) {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::NewArray,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void *operator new(size_t size, std::align_val_t align,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::New,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void *operator new[](size_t size, std::align_val_t align,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
return AllocatorPtr->allocate(size, scudo::Chunk::Origin::NewArray,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
|
|
INTERFACE WEAK void operator delete(void *ptr)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New);
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray);
|
|
}
|
|
INTERFACE WEAK void operator delete(void *ptr, std::nothrow_t const &)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New);
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray);
|
|
}
|
|
INTERFACE WEAK void operator delete(void *ptr, size_t size)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New, size);
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr, size_t size) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray, size);
|
|
}
|
|
INTERFACE WEAK void operator delete(void *ptr, std::align_val_t align)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New, 0,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr,
|
|
std::align_val_t align) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void operator delete(void *ptr, std::align_val_t align,
|
|
std::nothrow_t const &)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New, 0,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr, std::align_val_t align,
|
|
std::nothrow_t const &) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray, 0,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void operator delete(void *ptr, size_t size,
|
|
std::align_val_t align)NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::New, size,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
INTERFACE WEAK void operator delete[](void *ptr, size_t size,
|
|
std::align_val_t align) NOEXCEPT {
|
|
AllocatorPtr->deallocate(ptr, scudo::Chunk::Origin::NewArray, size,
|
|
static_cast<scudo::uptr>(align));
|
|
}
|
|
|
|
#endif // !SCUDO_ANDROID || !_BIONIC
|