diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2014-02-26 20:33:22 +0000 |
| commit | 9d09e2fe9066a6b656865c7d0dc37935a177e849 (patch) | |
| tree | 5004e935dc0f5d400431cc5416d5090b96bfe18d /compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | |
| parent | 2b41390c89bf87c5cb44203856a649b62f0e7010 (diff) | |
| download | bcm5719-llvm-9d09e2fe9066a6b656865c7d0dc37935a177e849.tar.gz bcm5719-llvm-9d09e2fe9066a6b656865c7d0dc37935a177e849.zip | |
Reapply r201910. MSVC gets __func__ defined explicitly, even though it
can't build anything here.
llvm-svn: 202297
Diffstat (limited to 'compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc')
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc index daaf7e1ce05..c3bdd34eb99 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_allocator.cc @@ -117,7 +117,7 @@ void *LowLevelAllocator::Allocate(uptr size) { if (allocated_end_ - allocated_current_ < (sptr)size) { uptr size_to_allocate = Max(size, GetPageSizeCached()); allocated_current_ = - (char*)MmapOrDie(size_to_allocate, __FUNCTION__); + (char*)MmapOrDie(size_to_allocate, __func__); allocated_end_ = allocated_current_ + size_to_allocate; if (low_level_alloc_callback) { low_level_alloc_callback((uptr)allocated_current_, |
