diff options
| author | Vitaly Buka <vitalybuka@google.com> | 2024-07-11 19:26:29 -0700 |
|---|---|---|
| committer | Vitaly Buka <vitalybuka@google.com> | 2024-07-11 19:27:55 -0700 |
| commit | 56b73f2a73b082c7b6a17cad37799fc218436be1 (patch) | |
| tree | b821f06ff0a9c4aa525d0a87ce17029b166b5620 | |
| parent | b12e141fb14a8b603984e1d29339e344e0db36ce (diff) | |
| download | llvm-56b73f2a73b082c7b6a17cad37799fc218436be1.zip llvm-56b73f2a73b082c7b6a17cad37799fc218436be1.tar.gz llvm-56b73f2a73b082c7b6a17cad37799fc218436be1.tar.bz2 | |
[msan] Fix compilation broken by invalid conflict resolution
| -rw-r--r-- | compiler-rt/lib/msan/msan_linux.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/msan/msan_linux.cpp b/compiler-rt/lib/msan/msan_linux.cpp index 5daf9d8..894cf17 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; } } |