Skip to content

[Sanitizer][Windows] Fix Windows buildbot failure after 64790064e82467b43c04a70b6e9873e6939be81f #82215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 19, 2024

Conversation

Enna1
Copy link
Contributor

@Enna1 Enna1 commented Feb 19, 2024

In #77488, a param raw_report is added for function UnmapOrDie(), causes the Windows buildbot failure:

This patch should fix the Windows buildbot failure.

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.
@llvmbot
Copy link
Member

llvmbot commented Feb 19, 2024

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: Enna1 (Enna1)

Changes

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 --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;
 

@Enna1 Enna1 merged commit d043b4b into main Feb 19, 2024
@Enna1 Enna1 deleted the users/Enna1/fix-win-UnmapOrDie branch February 19, 2024 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants