[compiler-rt] 56b73f2 - [msan] Fix compilation broken by invalid conflict resolution

[Vitaly Buka via llvm-commits]

Author: Vitaly Buka
Date: 2024-07-11T19:27:55-07:00
New Revision: 56b73f2a73b082c7b6a17cad37799fc218436be1

URL: https://github.com/llvm/llvm-project/commit/56b73f2a73b082c7b6a17cad37799fc218436be1
DIFF: https://github.com/llvm/llvm-project/commit/56b73f2a73b082c7b6a17cad37799fc218436be1.diff

LOG: [msan] Fix compilation broken by invalid conflict resolution

Added: 
    

Modified: 
    compiler-rt/lib/msan/msan_linux.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/msan/msan_linux.cpp b/compiler-rt/lib/msan/msan_linux.cpp
index 5daf9d8f110e8..894cf17002bbc 100644
--- a/compiler-rt/lib/msan/msan_linux.cpp
+++ b/compiler-rt/lib/msan/msan_linux.cpp
@@ -74,7 +74,7 @@ static bool ProtectMemoryRange(uptr beg, uptr size, const char *name) {
       uptr end = beg + size - 1;
       Printf(
           "FATAL: MemorySanitizer: Cannot protect memory range %p-%p (%s).\n",
-          (void *)beg, (void *)end);
+          (void *)beg, (void *)end, name);
       return false;
     }
   }