[Sanitizer] Fix failing sanitizer tests
The new pass manager was enabled by default [1].
The commit message states the following relevant differences:
* The inliner works slightly differently
* -O1 does some amount of inlining
These tests are affected because they specify `-O1` and then check the
reported stack trace.
[1] https://reviews.llvm.org/D95380
Differential Revision: https://reviews.llvm.org/D96198
GitOrigin-RevId: 04af72c5423eb5ff7c0deba2d08cb46d583bb9d4
diff --git a/test/tsan/blacklist2.cpp b/test/tsan/blacklist2.cpp
index 4ad9f41..31a7bca 100644
--- a/test/tsan/blacklist2.cpp
+++ b/test/tsan/blacklist2.cpp
@@ -3,7 +3,7 @@
// RUN: echo "fun:*Blacklisted_Thread2*" > %t.blacklist
// RUN: echo "fun:*CallTouchGlobal*" >> %t.blacklist
-// RUN: %clangxx_tsan -O1 %s -fsanitize-blacklist=%t.blacklist -o %t
+// RUN: %clangxx_tsan %s -fsanitize-blacklist=%t.blacklist -o %t
// RUN: %deflake %run %t 2>&1 | FileCheck %s
#include "test.h"
diff --git a/test/tsan/free_race.c b/test/tsan/free_race.c
index d508552..9209c12 100644
--- a/test/tsan/free_race.c
+++ b/test/tsan/free_race.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t
+// RUN: %clang_tsan %s -o %t
// RUN: %deflake %run %t | FileCheck %s --check-prefix=CHECK-NOZUPP
// RUN: %env_tsan_opts=suppressions='%s.supp':print_suppressions=1 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-SUPP
diff --git a/test/tsan/longjmp3.cpp b/test/tsan/longjmp3.cpp
index 842cf26..af23a3c 100644
--- a/test/tsan/longjmp3.cpp
+++ b/test/tsan/longjmp3.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
#include <pthread.h>
#include <stdio.h>
diff --git a/test/tsan/longjmp4.cpp b/test/tsan/longjmp4.cpp
index 4c2fbf0..d865076 100644
--- a/test/tsan/longjmp4.cpp
+++ b/test/tsan/longjmp4.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
#include <pthread.h>
#include <stdio.h>
diff --git a/test/tsan/race_on_heap.cpp b/test/tsan/race_on_heap.cpp
index 83bf36f..9057e9f 100644
--- a/test/tsan/race_on_heap.cpp
+++ b/test/tsan/race_on_heap.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan %s -o %t && %deflake %run %t | FileCheck %s
#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/test/tsan/race_top_suppression.cpp b/test/tsan/race_top_suppression.cpp
index bd5c1bd..eeb3ef8 100644
--- a/test/tsan/race_top_suppression.cpp
+++ b/test/tsan/race_top_suppression.cpp
@@ -1,5 +1,5 @@
// RUN: echo "race_top:TopFunction" > %t.supp
-// RUN: %clangxx_tsan -O1 %s -o %t
+// RUN: %clangxx_tsan %s -o %t
// RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s
// RUN: rm %t.supp
#include "test.h"
diff --git a/test/tsan/simple_stack.c b/test/tsan/simple_stack.c
index 71a3911..e46ffaa 100644
--- a/test/tsan/simple_stack.c
+++ b/test/tsan/simple_stack.c
@@ -46,14 +46,14 @@
return 0;
}
-// RUN: %clang_tsan -O1 %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan %s -o %t && %deflake %run %t 2>&1 | FileCheck %s
// Also check that functions instrumentation can be configured by either driver
// or legacy flags:
-// RUN: %clangxx_tsan -O1 %s -o %t -fno-sanitize-thread-func-entry-exit && %deflake %run %t 2>&1 \
+// RUN: %clangxx_tsan %s -o %t -fno-sanitize-thread-func-entry-exit && %deflake %run %t 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF %s
-// RUN: %clangxx_tsan -O1 %s -o %t -mllvm -tsan-instrument-func-entry-exit=0 && %deflake %run %t 2>&1 \
+// RUN: %clangxx_tsan %s -o %t -mllvm -tsan-instrument-func-entry-exit=0 && %deflake %run %t 2>&1 \
// RUN: | FileCheck --check-prefix=CHECK-FUNC-ENTRY-EXIT-OFF %s
// CHECK: WARNING: ThreadSanitizer: data race
diff --git a/test/tsan/sleep_sync.cpp b/test/tsan/sleep_sync.cpp
index b2c6a12..0eee9b6 100644
--- a/test/tsan/sleep_sync.cpp
+++ b/test/tsan/sleep_sync.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %deflake %run %t | FileCheck %s
+// RUN: %clangxx_tsan %s -o %t && %deflake %run %t | FileCheck %s
#include "test.h"
int X = 0;
diff --git a/test/ubsan/TestCases/Misc/missing_return.cpp b/test/ubsan/TestCases/Misc/missing_return.cpp
index fe8c8ba..6b63baa 100644
--- a/test/ubsan/TestCases/Misc/missing_return.cpp
+++ b/test/ubsan/TestCases/Misc/missing_return.cpp
@@ -1,4 +1,4 @@
-// RUN: %clangxx -fsanitize=return %gmlt %s -O3 -o %t
+// RUN: %clangxx -fsanitize=return %gmlt %s -o %t
// RUN: not %run %t 2>&1 | FileCheck %s
// RUN: %env_ubsan_opts=print_stacktrace=1 not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-STACKTRACE
// Error message does not exact what expected
