[compiler-rt] [scudo] Fix type mismatch in trusty. (PR #69024)

Christopher Ferris via llvm-commits llvm-commits at lists.llvm.org
Fri Oct 13 12:33:50 PDT 2023


https://github.com/cferris1000 created https://github.com/llvm/llvm-project/pull/69024

None

>From 51f614b456a7db7f07b907ce9455adc73bf21321 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <cferris at google.com>
Date: Fri, 13 Oct 2023 12:31:35 -0700
Subject: [PATCH] [scudo] Fix type mismatch in trusty.

---
 compiler-rt/lib/scudo/standalone/trusty.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/scudo/standalone/trusty.cpp b/compiler-rt/lib/scudo/standalone/trusty.cpp
index 26bc8e551ce45dd..26b349c6e506e37 100644
--- a/compiler-rt/lib/scudo/standalone/trusty.cpp
+++ b/compiler-rt/lib/scudo/standalone/trusty.cpp
@@ -62,7 +62,7 @@ void *map(void *Addr, uptr Size, const char *Name, uptr Flags,
 void unmap(UNUSED void *Addr, UNUSED uptr Size, UNUSED uptr Flags,
            UNUSED MapPlatformData *Data) {
   if (_trusty_munmap(Addr, Size) != 0)
-    reportUnmapError(Addr, Size);
+    reportUnmapError(reinterpret_cast<uptr>(Addr), Size);
 }
 
 void setMemoryPermission(UNUSED uptr Addr, UNUSED uptr Size, UNUSED uptr Flags,



More information about the llvm-commits mailing list