[compiler-rt] [Sanitizer][Windows] Fix Windows buildbot failure after 64790064e82467b43c04a70b6e9873e6939be81f (PR #82215)
via llvm-commits
llvm-commits at lists.llvm.org
Sun Feb 18 22:24:55 PST 2024
llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-compiler-rt-sanitizer
Author: Enna1 (Enna1)
<details>
<summary>Changes</summary>
In #<!-- -->77488, a param raw_report is added for function UnmapOrDie(), causes the Windows buildbot failure, see https://lab.llvm.org/buildbot/#/builders/127/builds/62395.
This patch should fix the Windows buildbot failure.
---
Full diff: https://github.com/llvm/llvm-project/pull/82215.diff
2 Files Affected:
- (modified) compiler-rt/lib/sanitizer_common/sanitizer_common.h (+1-1)
- (modified) compiler-rt/lib/sanitizer_common/sanitizer_win.cpp (+1-1)
``````````diff
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common.h b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
index dd4c71640b4492..47697ef280aa0d 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common.h
@@ -599,7 +599,7 @@ class InternalMmapVectorNoCtor {
T *new_data =
(T *)MmapOrDie(new_capacity_bytes, "InternalMmapVector", raw_report);
internal_memcpy(new_data, data_, size_ * sizeof(T));
- UnmapOrDie(data_, capacity_bytes_);
+ UnmapOrDie(data_, capacity_bytes_, raw_report);
data_ = new_data;
capacity_bytes_ = new_capacity_bytes;
}
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
index 06e496523eeaa1..4337515dc979a4 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cpp
@@ -144,7 +144,7 @@ void *MmapOrDie(uptr size, const char *mem_type, bool raw_report) {
return rv;
}
-void UnmapOrDie(void *addr, uptr size) {
+void UnmapOrDie(void *addr, uptr size, bool) {
if (!size || !addr)
return;
``````````
</details>
https://github.com/llvm/llvm-project/pull/82215
More information about the llvm-commits
mailing list