summaryrefslogtreecommitdiff
path: root/lib/scudo
diff options
context:
space:
mode:
authorKostya Kortchinsky <kostyak@google.com>2018-01-17 23:10:02 +0000
committerKostya Kortchinsky <kostyak@google.com>2018-01-17 23:10:02 +0000
commit47982b47999810f261eaff6b599e661be092ae10 (patch)
tree37951f27fe5e4dd7ea185e961d50344cf38fcff4 /lib/scudo
parent94146226b4d4ed96adb0a26e8a65da0582b3e5c0 (diff)
[scudo] Fix for the Scudo interface function scope
Summary: A forgotten include in `scudo_allocator.cpp` made the symbol only local :/ Before: ``` nm ./lib/clang/7.0.0/lib/linux/libclang_rt.scudo-i686-android.so | grep rss 00024730 t __scudo_set_rss_limit ``` After: ``` nm ./lib/clang/7.0.0/lib/linux/libclang_rt.scudo-i686-android.so | grep rs 00024760 T __scudo_set_rss_limit ``` And we want `T`! This include also means that we can get rid of the `extern "C"` in the C++ file, the compiler does fine without it (note that this was already the case for all the `__sanitizer_*` interface functions. Reviewers: alekseyshl, eugenis Reviewed By: eugenis Subscribers: #sanitizers, llvm-commits Differential Revision: https://reviews.llvm.org/D42199 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@322782 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/scudo')
-rw-r--r--lib/scudo/scudo_allocator.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/scudo/scudo_allocator.cpp b/lib/scudo/scudo_allocator.cpp
index 1329497f4..0e18141f4 100644
--- a/lib/scudo/scudo_allocator.cpp
+++ b/lib/scudo/scudo_allocator.cpp
@@ -17,6 +17,7 @@
#include "scudo_allocator.h"
#include "scudo_crc32.h"
#include "scudo_flags.h"
+#include "scudo_interface_internal.h"
#include "scudo_tsd.h"
#include "scudo_utils.h"
@@ -735,10 +736,8 @@ uptr __sanitizer_get_allocated_size(const void *Ptr) {
// Interface functions
-extern "C" {
void __scudo_set_rss_limit(uptr LimitMb, s32 HardLimit) {
if (!SCUDO_CAN_USE_PUBLIC_INTERFACE)
return;
Instance.setRssLimit(LimitMb, !!HardLimit);
}
-} // extern "C"