summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Carlier <devnexen@gmail.com>2019-08-27 04:24:19 +0000
committerDavid Carlier <devnexen@gmail.com>2019-08-27 04:24:19 +0000
commita65838a7d48c7faa6227f287dac20c0d8aae4a2d (patch)
tree473fb4b1dd6a98c0c5271d820a66983812a92523 /lib
parenta9793ee9a2655d355d8e635b5f7b4ab55bc79cc8 (diff)
downloadcompiler-rt-a65838a7d48c7faa6227f287dac20c0d8aae4a2d.tar.gz
Fix buildbot
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@370011 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/sanitizer_common/sanitizer_common.h3
-rw-r--r--lib/sanitizer_common/sanitizer_posix_libcdep.cpp8
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h
index 7a83be3e4..0a1e84ec7 100644
--- a/lib/sanitizer_common/sanitizer_common.h
+++ b/lib/sanitizer_common/sanitizer_common.h
@@ -100,7 +100,8 @@ void UnmapOrDie(void *addr, uptr size);
void *MmapOrDieOnFatalError(uptr size, const char *mem_type);
bool MmapFixedNoReserve(uptr fixed_addr, uptr size, const char *name = nullptr)
WARN_UNUSED_RESULT;
-bool MmapFixedSuperNoReserve(uptr fixed_addr, uptr size, const char *name = nullptr)
+bool MmapFixedSuperNoReserve(uptr fixed_addr, uptr size,
+ const char *name = nullptr)
WARN_UNUSED_RESULT;
void *MmapNoReserveOrDie(uptr size, const char *mem_type);
void *MmapFixedOrDie(uptr fixed_addr, uptr size, const char *name = nullptr);
diff --git a/lib/sanitizer_common/sanitizer_posix_libcdep.cpp b/lib/sanitizer_common/sanitizer_posix_libcdep.cpp
index 0c167afd4..f1187a635 100644
--- a/lib/sanitizer_common/sanitizer_posix_libcdep.cpp
+++ b/lib/sanitizer_common/sanitizer_posix_libcdep.cpp
@@ -304,11 +304,13 @@ void PlatformPrepareForSandboxing(__sanitizer_sandbox_arguments *args) {
MemoryMappingLayout::CacheMemoryMappings();
}
-static bool MmapFixed(uptr fixed_addr, uptr size, int additional_flags, const char *name) {
+static bool MmapFixed(uptr fixed_addr, uptr size,
+ int additional_flags, const char *name) {
size = RoundUpTo(size, GetPageSizeCached());
fixed_addr = RoundDownTo(fixed_addr, GetPageSizeCached());
uptr p = MmapNamed((void *)fixed_addr, size, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_FIXED | additional_flags | MAP_ANON, name);
+ MAP_PRIVATE | MAP_FIXED | additional_flags | MAP_ANON,
+ name);
int reserrno;
if (internal_iserror(p, &reserrno)) {
Report("ERROR: %s failed to "
@@ -334,7 +336,7 @@ bool MmapFixedSuperNoReserve(uptr fixed_addr, uptr size, const char *name) {
#else
bool r = MmapFixedNoReserve(fixed_addr, size, name);
if (r)
- SetShadowRegionHugePageMode(fixed_addr,size);
+ SetShadowRegionHugePageMode(fixed_addr, size);
return r;
#endif
}