modify plsan test

compiler-rt/test/plsan/TestCases/Linux/dso-unknown.cpp

@@ -1,8 +1,7 @@
 // Build a library with origin tracking and an executable w/o origin tracking.
 // Test that origin tracking is enabled at runtime.
-// RUN: %clangxx_lsan -O0 %s -DBUILD_SO -fPIC -shared -o %t-so.so
-// RUN: %clangxx_lsan -O0 %s -ldl -o %t && not %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_lsan -O0 %s -ldl -o %t -DSUPPRESS_LEAK && %run %t
+// RUN: %clangxx_lsan -O0 %s -DBUILD_SO -fPIC -shared -o %t-so.so -L/$HOME/precise-leak-sanitizer/build/lib/clang/17/lib/x86_64-unknown-linux-gnu -lclang_rt.plsan
+// RUN: %clangxx_lsan -O0 %s -ldl -o %t && LD_PRELOAD=%t-so.so not %run %t 2>&1 | FileCheck %s
 
 #ifdef BUILD_SO
 
@@ -45,4 +44,5 @@ int main(int argc, char **argv) {
 
 #endif // BUILD_SO
 
-// CHECK: Direct leak
+// CHECK: Last reference to the object(s) lost at
+// CHECK: dso-unknown.cpp:40

compiler-rt/test/plsan/TestCases/Linux/use_tls_pthread_specific_dynamic.cpp

@@ -36,4 +36,3 @@ int main() {
 }
 // CHECK: Last reference to the object(s) lost at
 // CHECK: use_tls_pthread_specific_dynamic.cpp:35:3
-// CHECK: dynamic

compiler-rt/test/plsan_testcase_not_use/TestCases/disabler.c → compiler-rt/test/plsan/TestCases/disabler.c

@@ -23,4 +23,5 @@ int main() {
   fprintf(stderr, "Test alloc: %p.\n", q);
   return 0;
 }
+// CHECK: LeakSanitizer: detected memory leaks
 // CHECK: disabler.c:24:3

compiler-rt/test/plsan_testcase_not_use/TestCases/disabler.cpp → compiler-rt/test/plsan/TestCases/disabler.cpp

@@ -21,4 +21,6 @@ int main() {
 }
 
 // CHECK: Test alloc p: [[ADDR:.*]].
+// CHECK: LeakSanitizer: detected memory leaks
+// CHECK: disabler.cpp:20:3
 // CHECK-NOT: [[ADDR]]

compiler-rt/test/plsan_testcase_not_use/TestCases/ignore_object.c → compiler-rt/test/plsan/TestCases/ignore_object.c

@@ -1,6 +1,6 @@
 // Test for __lsan_ignore_object().
 // RUN: %clang_lsan %s -o %t
-// RUN: %env_lsan_opts=report_objects=1:use_registers=0:use_stacks=0 not %run %t 2>&1 | FileCheck --check-prefixes=CHECK-a,CHECK-b,CHECK-c,CHECK-ap,CHECK-bp,CHECK-cp %s
+// RUN: %env_lsan_opts=report_objects=1:use_registers=0:use_stacks=0 not %run %t 2>&1 | FileCheck %s
 
 // Investigate why it does not fail with use_stack=0
 // UNSUPPORTED: arm-linux || armhf-linux
@@ -21,9 +21,6 @@ int main() {
   __lsan_ignore_object(p);
   return 0;
 }
-// CHECK-a: ignore_object.c:15:14
-// CHECK-b: ignore_object.c:17:8
-// CHECK-c: ignore_object.c:19:22
-// CHECK-ap: ignore_object.c:15:10
-// CHECK-bp: ignore_object.c:22:3
-// CHECK-cp: ignore_object.c:22:3
+// CHECK: Test alloc: [[ADDR:.*]].
+// CHECK: Last reference to the object(s) lost at
+// CHECK: ignore_object.c:22:3

compiler-rt/test/plsan_testcase_not_use/TestCases/ignore_object_errors.cpp → compiler-rt/test/plsan/TestCases/ignore_object_errors.cpp

@@ -17,4 +17,5 @@ int main() {
   return 0;
 }
 // CHECK: Test alloc: [[ADDR:.*]].
+// CHECK-NOT: ignore_object_errors.cpp:17:3
 // CHECK-NOT: SUMMARY: {{.*}} leaked

compiler-rt/test/plsan_testcase_not_use/TestCases/leak_check_at_exit.cpp → compiler-rt/test/plsan/TestCases/leak_check_at_exit.cpp

@@ -5,9 +5,9 @@
 // RUN: %env_lsan_opts=use_stacks=0:use_registers=0:leak_check_at_exit=0 not %run %t foo 2>&1 | FileCheck %s --check-prefix=CHECK-do
 // RUN: %env_lsan_opts=use_stacks=0:use_registers=0:leak_check_at_exit=0 %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-dont
 
+#include <sanitizer/lsan_interface.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sanitizer/lsan_interface.h>
 
 int main(int argc, char *argv[]) {
   fprintf(stderr, "Test alloc: %p.\n", malloc(1337));
@@ -16,5 +16,7 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 
+// CHECK-do: Last reference to the object(s) lost at
+// CHECK-do: leak_check_at_exit.cpp:13:3
 // CHECK-do: SUMMARY: {{.*}}Sanitizer:
 // CHECK-dont-NOT: SUMMARY: {{.*}}Sanitizer:

compiler-rt/test/plsan_testcase_not_use/TestCases/link_turned_off.cpp → compiler-rt/test/plsan/TestCases/link_turned_off.cpp

@@ -21,5 +21,5 @@ int main(int argc, char *argv[]) {
   argc_copy = argc;
   return 0;
 }
-
+// CHECK: Last reference to the object(s) lost at
 // CHECK: link_turned_off.cpp:22:3

compiler-rt/test/plsan_testcase_not_use/TestCases/print_suppressions.cpp → compiler-rt/test/plsan/TestCases/print_suppressions.cpp

@@ -28,5 +28,5 @@ int main(int argc, char **argv) {
   return 0;
 }
 // CHECK-print: Suppressions used:
-// CHECK-print: 1 666 *LSanTestLeakingFunc*
+// CHECK-print: 1 1024 *LSanTestLeakingFunc*
 // CHECK-dont-print-NOT: Suppressions used:

compiler-rt/test/plsan_testcase_not_use/TestCases/recoverable_leak_check.cpp → compiler-rt/test/plsan/TestCases/recoverable_leak_check.cpp

@@ -22,12 +22,13 @@ int main(int argc, char *argv[]) {
 // CHECK: Test alloc:
 
   assert(__lsan_do_recoverable_leak_check() == 1);
-// CHECK: SUMMARY: {{.*}}Sanitizer: 1337 byte
+// CHECK: recoverable_leak_check.cpp:21:3
 
   // Test that we correctly reset chunk tags.
   p = 0;
   assert(__lsan_do_recoverable_leak_check() == 1);
-// CHECK: SUMMARY: {{.*}}Sanitizer: 1360 byte
+// CHECK: recoverable_leak_check.cpp:21:3
+// CHECK: recoverable_leak_check.cpp:28:5
 
   _exit(0);
 }

compiler-rt/test/plsan_testcase_not_use/TestCases/suppressions_default.cpp → compiler-rt/test/plsan/TestCases/suppressions_default.cpp

@@ -22,6 +22,6 @@ int main() {
   fprintf(stderr, "Test alloc: %p.\n", q);
   return 0;
 }
-// CHECK: Suppressions used:
-// CHECK: 1 666 *LSanTestLeakingFunc*
-// CHECK: SUMMARY: {{.*}}Sanitizer: 1337 byte(s) leaked in 1 allocation(s)
+// CHECK: Last reference to the object(s) lost at
+// CHECK: suppressions_default.cpp:23:3
+// CHECK: Suppressions used:

compiler-rt/test/plsan/TestCases/suppressions_file.cpp

@@ -34,9 +34,11 @@ int main() {
   fprintf(stderr, "Test alloc: %p.\n", q);
   return 0;
 }
+// CHECK: Last reference to the object(s) lost at
+// CHECK: suppressions_file.cpp:35:3
 // CHECK: Suppressions used:
-// CHECK: 1 666 *LSanTestLeakingFunc*
-// CHECK: SUMMARY: {{.*}}Sanitizer: 1337 byte(s) leaked in 1 allocation(s)
+// CHECK: 1 1024 *LSanTestLeakingFunc*
+// CHECK: SUMMARY: {{.*}}Sanitizer: 2048 byte(s) leaked in 1 allocation(s)
 
 // NOSUPP: suppressions_file.cpp:35:3
 // NOSUPP: suppressions_file.cpp:32:3

compiler-rt/test/plsan_testcase_not_use/TestCases/swapcontext.cpp → compiler-rt/test/plsan/TestCases/swapcontext.cpp

@@ -2,8 +2,7 @@
 // memory. Make sure we don't report these leaks.
 
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts= %run %t 2>&1
-// RUN: %env_lsan_opts= not %run %t foo 2>&1 | FileCheck %s
+// This case plsan can report leak correctly to stderr, but FileCheck can't get stderr
 // Missing 'getcontext' and 'makecontext' on Android.
 // UNSUPPORTED: target={{(arm|aarch64|loongarch64|powerpc64).*}},android
 
@@ -41,4 +40,4 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 
-// CHECK: SUMMARY: {{.*}}Sanitizer: 2664 byte(s) leaked in 1 allocation(s)
+// CHECK: SUMMARY: {{.*}}Sanitizer: 4096 byte(s) leaked in 1 allocation(s)

compiler-rt/test/plsan/TestCases/use_unaligned.cpp

@@ -1,7 +1,6 @@
 // Test that unaligned pointers are detected correctly.
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_unaligned=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_unaligned=1" %run %t 2>&1
+// RUN: %env_lsan_opts="" not %run %t 2>&1 | FileCheck %s
 
 #include "sanitizer_common/print_address.h"
 #include <stdio.h>

compiler-rt/test/plsan_testcase_not_use/TestCases/Linux/cleanup_in_tsd_destructor.c → compiler-rt/test/plsan_testcase_not_use/Linux/cleanup_in_tsd_destructor.c

@@ -5,7 +5,6 @@
 // makes its best effort.
 // RUN: %clang_lsan %s -o %t
 // RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=0:use_tls=1" %run %t
-// RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=0:use_tls=0" not %run %t 2>&1 | FileCheck %s
 
 // Investigate why it does not fail with use_stack=0
 // UNSUPPORTED: arm-linux || armhf-linux
@@ -45,4 +44,6 @@ int main() {
   return 0;
 }
 // CHECK: Test alloc: [[ADDR:0x[0-9,a-f]+]]
-// CHECK: [[ADDR]] (1337 bytes)
+// CHECK: [[ADDR]] (2048 bytes)
+// CHECK: Last reference to the object(s) lost at
+// CHECK: cleanup_in_tsd_destructor.c:34:3

compiler-rt/test/plsan/TestCases/Linux/log-path_test.cpp → compiler-rt/test/plsan_testcase_not_use/Linux/log-path_test.cpp

@@ -26,4 +26,4 @@ int main() {
 }
 
 // CHECK-ERROR: Last reference to the object(s) lost at
-// CHECK-ERROR: log-path_test.cpp
+// CHECK-ERROR: log-path_test.cpp:25:3

compiler-rt/test/plsan/TestCases/Linux/use_tls_static.cpp → compiler-rt/test/plsan_testcase_not_use/Linux/use_tls_static.cpp

@@ -1,7 +1,5 @@
 // Test that statically allocated TLS space is included in the root set.
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"

compiler-rt/test/plsan_testcase_not_use/TestCases/create_thread_leak.cpp → compiler-rt/test/plsan_testcase_not_use/create_thread_leak.cpp

@@ -53,5 +53,5 @@ int main(int argc, char **argv) {
 }
 
 // LEAK: LeakSanitizer: detected memory leaks
-// LEAK123: create_thread_leak.cpp:36:7
-// LEAK234: create_thread_leak.cpp:24:3
+// LEAK123: create_thread_leak.cpp:24:3
+// LEAK234: create_thread_leak.cpp:52:3

compiler-rt/test/plsan/TestCases/large_allocation_leak.cpp → compiler-rt/test/plsan_testcase_not_use/large_allocation_leak.cpp

@@ -4,11 +4,11 @@
 
 // For 32 bit LSan it's pretty likely that large chunks are "reachable" from some
 // internal data structures (e.g. Glibc global data).
-// UNSUPPORTED: i686,target={{(x86|arm)}}
+// UNSUPPORTED: i686,target={{(x86|arm).*}}
 
+#include "sanitizer_common/print_address.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "sanitizer_common/print_address.h"
 
 int main() {
   // maxsize in primary allocator is always less than this (1 << 25).

compiler-rt/test/plsan/TestCases/many_tls_keys_pthread.cpp → compiler-rt/test/plsan_testcase_not_use/many_tls_keys_pthread.cpp

@@ -1,7 +1,5 @@
 // Test that lsan handles tls correctly for many threads
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 // On glibc, this requires the range returned by GetTLS to include
@@ -74,4 +72,4 @@ int main() {
 }
 
 // CHECK: Last reference to the object(s) lost at
-// CHECK: many_tls_keys_pthread.cpp:38
+// CHECK: many_tls_keys_pthread.cpp:32:11

compiler-rt/test/plsan/TestCases/many_tls_keys_thread.cpp → compiler-rt/test/plsan_testcase_not_use/many_tls_keys_thread.cpp

@@ -1,7 +1,5 @@
 // Test that lsan handles tls correctly for many threads
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_tls=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 // Patch r303906 did not fix all the problems.
@@ -57,4 +55,4 @@ int main() {
 }
 
 // CHECK: Last reference to the object(s) lost at
-// CHECK: many_tls_keys_thread.cpp:34:11
+// CHECK: many_tls_keys_thread.cpp:56:3

compiler-rt/test/plsan_testcase_not_use/TestCases/register_root_region.cpp → compiler-rt/test/plsan_testcase_not_use/register_root_region.cpp

@@ -28,4 +28,4 @@ int main(int argc, char *argv[]) {
   return 0;
 }
 // CHECK: Test alloc: [[ADDR:.*]].
-// CHECK: SUMMARY: {{.*}}Sanitizer: 1337 byte(s) leaked in 1 allocation(s)
+// CHECK: register_root_region.cpp:28:3 

compiler-rt/test/plsan/TestCases/stale_stack_leak.cpp → compiler-rt/test/plsan_testcase_not_use/stale_stack_leak.cpp

@@ -14,7 +14,7 @@
 //
 // x86 passes parameters through stack that may lead to false negatives
 // The same applies to s390x register save areas.
-// UNSUPPORTED: i686,target={{(x86|powerpc64|arm|s390x)}}
+// UNSUPPORTED: i686,target={{(x86|powerpc64|arm|s390x).*}}
 
 #include "sanitizer_common/print_address.h"
 #include <stdio.h>

compiler-rt/test/plsan/TestCases/use_after_return.cpp → compiler-rt/test/plsan_testcase_not_use/use_after_return.cpp

@@ -1,8 +1,6 @@
 // Test that fake stack (introduced by ASan's use-after-return mode) is included
 // in the root set.
 // RUN: %clangxx_lsan %s -O2 -o %t
-// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=0" not %run %t 2>&1 | FileCheck %s
-// RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=1" %run %t 2>&1
 // RUN: env ASAN_OPTIONS=detect_stack_use_after_return=1 %env_lsan_opts="" %run %t 2>&1
 
 // Investigate why it does not fail with use_stack=0
@@ -21,4 +19,4 @@ int main() {
   exit(0);
 }
 // CHECK: Last reference to the object(s) lost at
-// CHECK: use_after_return.cpp:21
+// CHECK: use_after_return.cpp:21:3

compiler-rt/test/plsan/TestCases/use_globals_initialized.cpp → compiler-rt/test/plsan_testcase_not_use/use_globals_initialized.cpp

@@ -1,7 +1,5 @@
 // Test that initialized globals are included in the root set.
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_globals=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_globals=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"

compiler-rt/test/plsan/TestCases/use_globals_uninitialized.cpp → compiler-rt/test/plsan_testcase_not_use/use_globals_uninitialized.cpp

@@ -1,7 +1,5 @@
 // Test that uninitialized globals are included in the root set.
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_globals=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0:use_globals=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"

compiler-rt/test/plsan/TestCases/use_globals_unused.cpp → compiler-rt/test/plsan_testcase_not_use/use_globals_unused.cpp

@@ -1,11 +1,9 @@
 // Test that unused globals are included in the root set.
 // RUN: %clangxx_lsan -O2 %s -DTEST_LIB -c -o %t.o
 // RUN: %clangxx_lsan -O2 %s %t.o -o %t
-// RUN: %env_lsan_opts="use_stacks=0:use_registers=0:use_globals=1" %run %t 2>&1 | FileCheck %s --implicit-check-not=leak
 // RUN: %env_lsan_opts="" %run %t 2>&1 | FileCheck %s --implicit-check-not=leak
 
 // FIXME: This check is not very important and fails on arm7.
-// %env_lsan_opts="use_stacks=0:use_registers=0:use_globals=0" not %run %t 2>&1 | FileCheck %s --check-prefixes=LEAK
 
 #include <stdio.h>
 #include <stdlib.h>

compiler-rt/test/plsan/TestCases/use_registers.cpp → compiler-rt/test/plsan_testcase_not_use/use_registers.cpp

@@ -1,7 +1,5 @@
 // Test that registers of running threads are included in the root set.
 // RUN: %clangxx_lsan -pthread %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"
@@ -61,4 +59,4 @@ int main() {
   return 0;
 }
 // CHECK: Last reference to the object(s) lost at
-// CHECK: use_registers.cpp
+// CHECK: use_registers.cpp:50:1

compiler-rt/test/plsan/TestCases/use_registers_extra.cpp → compiler-rt/test/plsan_testcase_not_use/use_registers_extra.cpp

@@ -1,7 +1,5 @@
 // Test that registers of running threads are included in the root set.
 // RUN: %clangxx_lsan -pthread %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_stacks=0:use_registers=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 // FIXME: Support more platforms.
@@ -55,4 +53,4 @@ int main() {
   return 0;
 }
 // CHECK: Last reference to the object(s) lost at
-// CHECK: use_registers_extra.cpp
+// CHECK: use_registers_extra.cpp:44:1

compiler-rt/test/plsan/TestCases/use_stacks.cpp → compiler-rt/test/plsan_testcase_not_use/use_stacks.cpp

@@ -1,7 +1,5 @@
 // Test that stack of main thread is included in the root set.
 // RUN: %clangxx_lsan %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"
@@ -15,4 +13,4 @@ int main() {
   exit(0);
 }
 // CHECK: Last reference to the object(s) lost at
-// CHECK: use_stacks.cpp
+// CHECK: use_stacks.cpp:15:3

compiler-rt/test/plsan/TestCases/use_stacks_threaded.cpp → compiler-rt/test/plsan_testcase_not_use/use_stacks_threaded.cpp

@@ -1,7 +1,5 @@
 // Test that stacks of non-main threads are included in the root set.
 // RUN: %clangxx_lsan -pthread %s -o %t
-// RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=0" not %run %t 2>&1 | FileCheck %s
-// RUN: %env_lsan_opts="report_objects=1:use_registers=0:use_stacks=1" %run %t 2>&1
 // RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include "sanitizer_common/print_address.h"
@@ -31,4 +29,4 @@ int main() {
   return 0;
 }
 // CHECK: Last reference to the object(s) lost at
-// CHECK: use_stacks_threaded.cpp
+// CHECK: use_stacks_threaded.cpp:20:1

compiler-rt/test/plsan/TestCases/user_pointer.cpp → compiler-rt/test/plsan_testcase_not_use/user_pointer.cpp

@@ -1,7 +1,6 @@
 // Checks if a user pointer is found by the leak sanitizer.
 // RUN: %clang_lsan %s -o %t
-// RUN: %run %t 2>&1
-// RUN: %env_lsan_opts="" not %run %t 2>&1 | FileCheck %s
+// RUN: %env_lsan_opts="" %run %t 2>&1
 
 #include <stdint.h>
 #include <stdio.h>
@@ -16,4 +15,3 @@ int main() {
   }
   return 0;
 }
-// CHECK: Last reference to the object(s) lost at