https://github.com/vitalybuka updated
https://github.com/llvm/llvm-project/pull/111949
>From 396c12a5c5a8ecef041b333d92b7a3dcaa82a776 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalyb...@google.com>
Date: Thu, 10 Oct 2024 21:54:59 -0700
Subject: [PATCH 1/3] rebase
Created using spr 1.3.4
---
compiler-rt/lib/lsan/lsan_common.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler-rt/lib/lsan/lsan_common.cpp
b/compiler-rt/lib/lsan/lsan_common.cpp
index 4fd93d4edc5639..a012e60c314253 100644
--- a/compiler-rt/lib/lsan/lsan_common.cpp
+++ b/compiler-rt/lib/lsan/lsan_common.cpp
@@ -773,10 +773,10 @@ static bool PrintResults(LeakReport &report) {
GetSuppressionContext()->PrintMatchedSuppressions();
if (unsuppressed_count > 0) {
report.PrintSummary();
+ if (common_flags()->verbosity >= 2 && flags()->log_threads)
+ PrintThreads();
return true;
}
- if (common_flags()->verbosity >= 2 && flags()->log_threads)
- PrintThreads();
return false;
}
>From 86eb360c7c680640c485e283f0385fcfa7f4fccd Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalyb...@google.com>
Date: Thu, 10 Oct 2024 22:00:03 -0700
Subject: [PATCH 2/3] change condition
Created using spr 1.3.4
---
compiler-rt/lib/lsan/lsan_common.cpp | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/compiler-rt/lib/lsan/lsan_common.cpp
b/compiler-rt/lib/lsan/lsan_common.cpp
index a012e60c314253..b584d1e9723fc8 100644
--- a/compiler-rt/lib/lsan/lsan_common.cpp
+++ b/compiler-rt/lib/lsan/lsan_common.cpp
@@ -771,13 +771,12 @@ static bool PrintResults(LeakReport &report) {
}
if (common_flags()->print_suppressions)
GetSuppressionContext()->PrintMatchedSuppressions();
- if (unsuppressed_count > 0) {
+ if (unsuppressed_count)
report.PrintSummary();
- if (common_flags()->verbosity >= 2 && flags()->log_threads)
- PrintThreads();
- return true;
- }
- return false;
+ if ((unsuppressed_count && common_flags()->verbosity >= 2) ||
+ flags()->log_threads)
+ PrintThreads();
+ return unsuppressed_count;
}
static bool CheckForLeaks() {
>From 16f8b8f600f8c5a9b42cdf653df573e3e6666005 Mon Sep 17 00:00:00 2001
From: Vitaly Buka <vitalyb...@google.com>
Date: Fri, 11 Oct 2024 17:30:10 -0700
Subject: [PATCH 3/3] test
Created using spr 1.3.4
---
compiler-rt/test/lsan/TestCases/print_threads.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler-rt/test/lsan/TestCases/print_threads.c
b/compiler-rt/test/lsan/TestCases/print_threads.c
index 1843a7e1bbfb90..b3072da93fab62 100644
--- a/compiler-rt/test/lsan/TestCases/print_threads.c
+++ b/compiler-rt/test/lsan/TestCases/print_threads.c
@@ -30,4 +30,4 @@ int main(int argc, char *argv[]) {
// CHECK: Thread T0/{{[0-9]+}} was created by T-1
// CHECK: Thread T1/{{[0-9]+}} was created by T0/
-// CHECK: Thread T2/{{[0-9]+}} was created by T0/
\ No newline at end of file
+// CHECK: Thread T2/{{[0-9]+}} was created by T0/
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
