Clarify and/or

thurstond · thurstond · commit a601f6cec759 · 2025-06-04T17:41:17.000Z
diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cpp
@@ -263,7 +263,7 @@ static void ReExecIfNeeded(bool ignore_heap) {
     if (personality(old_personality | ADDR_NO_RANDOMIZE) == -1) {
       Printf("FATAL: ThreadSanitizer: unable to disable ASLR (perhaps "
              "sandboxing is enabled?).\n");
-      Printf("FATAL: Please rerun without sandboxing or ASLR.\n");
+      Printf("FATAL: Please rerun without sandboxing and/or ASLR.\n");
       Die();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ static void ReExecIfNeeded(bool ignore_heap) {`
`263`	`263`	`if (personality(old_personality \| ADDR_NO_RANDOMIZE) == -1) {`
`264`	`264`	`Printf("FATAL: ThreadSanitizer: unable to disable ASLR (perhaps "`
`265`	`265`	`"sandboxing is enabled?).\n");`
`266`		`- Printf("FATAL: Please rerun without sandboxing or ASLR.\n");`
	`266`	`+ Printf("FATAL: Please rerun without sandboxing and/or ASLR.\n");`
`267`	`267`	`Die();`
`268`	`268`	`}`
`269`	`269`