[msan] Fix compilation broken by invalid conflict resolution

vitalybuka · vitalybuka · commit 56b73f2a73b0 · 2024-07-11T19:27:55.000-07:00
diff --git 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;
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ static bool ProtectMemoryRange(uptr beg, uptr size, const char *name) {`
`74`	`74`	`uptr end = beg + size - 1;`
`75`	`75`	`Printf(`
`76`	`76`	`"FATAL: MemorySanitizer: Cannot protect memory range %p-%p (%s).\n",`
`77`		`- (void )beg, (void )end);`
	`77`	`+ (void )beg, (void )end, name);`
`78`	`78`	`return false;`
`79`	`79`	`}`
`80`	`80`	`}`