diff options
author | Daniel Sanders <daniel.sanders@imgtec.com> | 2015-07-31 09:04:37 +0000 |
---|---|---|
committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2015-07-31 09:04:37 +0000 |
commit | 33c1f805761e801822e1b60c8c7bc7e483ad2423 (patch) | |
tree | 41c32093e1524b2f46277c6577ba797117759599 | |
parent | 9984ff4606b2fab9341e81e8378b7e24bb3d29f5 (diff) |
Revert r243686 - [Sanitizers] [Bug 24151] Generalize type of offset in internal_mmap
It's implicated in a buildbot failure and while the failure looks unrelated,
this commit is the only probably candidate in the blamelist.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@243740 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/sanitizer_common/sanitizer_common.h | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_linux.cc | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_posix.cc | 6 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_posix.h | 2 | ||||
-rw-r--r-- | lib/sanitizer_common/sanitizer_win.cc | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/sanitizer_common/sanitizer_common.h b/lib/sanitizer_common/sanitizer_common.h index e2f33b27c..c064e2cd5 100644 --- a/lib/sanitizer_common/sanitizer_common.h +++ b/lib/sanitizer_common/sanitizer_common.h @@ -238,7 +238,7 @@ bool ReadFileToBuffer(const char *file_name, char **buff, uptr *buff_size, // (or NULL if mapping fails). Stores the size of mmaped region // in '*buff_size'. void *MapFileToMemory(const char *file_name, uptr *buff_size); -void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset); +void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset); bool IsAccessibleMemoryRange(uptr beg, uptr size); diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc index 681b6f3fa..dced4eede 100644 --- a/lib/sanitizer_common/sanitizer_linux.cc +++ b/lib/sanitizer_common/sanitizer_linux.cc @@ -104,7 +104,7 @@ namespace __sanitizer { // --------------- sanitizer_libc.h uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd, - OFF_T offset) { + u64 offset) { #if SANITIZER_FREEBSD || SANITIZER_LINUX_USES_64BIT_SYSCALLS return internal_syscall(SYSCALL(mmap), (uptr)addr, length, prot, flags, fd, offset); diff --git a/lib/sanitizer_common/sanitizer_posix.cc b/lib/sanitizer_common/sanitizer_posix.cc index abf6738a8..5754c9029 100644 --- a/lib/sanitizer_common/sanitizer_posix.cc +++ b/lib/sanitizer_common/sanitizer_posix.cc @@ -240,14 +240,14 @@ void *MapFileToMemory(const char *file_name, uptr *buff_size) { return internal_iserror(map) ? 0 : (void *)map; } -void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset) { +void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset) { uptr flags = MAP_SHARED; if (addr) flags |= MAP_FIXED; uptr p = internal_mmap(addr, size, PROT_READ | PROT_WRITE, flags, fd, offset); int mmap_errno = 0; if (internal_iserror(p, &mmap_errno)) { - Printf("could not map writable file (%d, %lld, %zu): %zd, errno: %d\n", - fd, (long long)offset, size, p, mmap_errno); + Printf("could not map writable file (%d, %zu, %zu): %zd, errno: %d\n", + fd, offset, size, p, mmap_errno); return 0; } return (void *)p; diff --git a/lib/sanitizer_common/sanitizer_posix.h b/lib/sanitizer_common/sanitizer_posix.h index 5a9e97d5b..a3377a851 100644 --- a/lib/sanitizer_common/sanitizer_posix.h +++ b/lib/sanitizer_common/sanitizer_posix.h @@ -35,7 +35,7 @@ uptr internal_write(fd_t fd, const void *buf, uptr count); // Memory uptr internal_mmap(void *addr, uptr length, int prot, int flags, - int fd, OFF_T offset); + int fd, u64 offset); uptr internal_munmap(void *addr, uptr length); int internal_mprotect(void *addr, uptr length, int prot); diff --git a/lib/sanitizer_common/sanitizer_win.cc b/lib/sanitizer_common/sanitizer_win.cc index e89198852..0ddb70a32 100644 --- a/lib/sanitizer_common/sanitizer_win.cc +++ b/lib/sanitizer_common/sanitizer_win.cc @@ -170,7 +170,7 @@ void *MapFileToMemory(const char *file_name, uptr *buff_size) { UNIMPLEMENTED(); } -void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, OFF_T offset) { +void *MapWritableFileToMemory(void *addr, uptr size, fd_t fd, uptr offset) { UNIMPLEMENTED(); } |