From 7afd956e0fff78cf0f0be6b362ba1796bae31932 Mon Sep 17 00:00:00 2001 From: Leonard Chan Date: Wed, 6 Oct 2021 13:53:26 -0700 Subject: [PATCH] [compiler-rt][memprof] Disambiguate checks for __tls_get_addr in output TestCases/stress_dtls.c was failing when we ran memprof tests for the first time. The test checks that __tls_get_addr is not in the output for the last run when it is possible for the interceptor __interceptor___tls_get_addr to be in the output from stack dumps. The test actually intends to check that the various __tls_get_addr reports don't get emitted when intercept_tls_get_addr=0. This updates the test to also check for the following `:` and preceding `==` which should ignore the __interceptor___tls_get_addr interceptor. Differential Revision: https://reviews.llvm.org/D111192 --- compiler-rt/test/memprof/TestCases/stress_dtls.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compiler-rt/test/memprof/TestCases/stress_dtls.c b/compiler-rt/test/memprof/TestCases/stress_dtls.c index 0cabf0d..f730cca 100644 --- a/compiler-rt/test/memprof/TestCases/stress_dtls.c +++ b/compiler-rt/test/memprof/TestCases/stress_dtls.c @@ -10,19 +10,19 @@ // RUN: %env_memprof_opts=log_path=stderr:verbosity=2 %run %t 10 2 2>&1 | FileCheck %s // RUN: %env_memprof_opts=log_path=stderr:verbosity=2:intercept_tls_get_addr=1 %run %t 10 2 2>&1 | FileCheck %s // RUN: %env_memprof_opts=log_path=stderr:verbosity=2:intercept_tls_get_addr=0 %run %t 10 2 2>&1 | FileCheck %s --check-prefix=CHECK0 -// CHECK: __tls_get_addr +// CHECK: ==__tls_get_addr: // CHECK: Creating thread 0 -// CHECK: __tls_get_addr +// CHECK: ==__tls_get_addr: // CHECK: Creating thread 1 -// CHECK: __tls_get_addr +// CHECK: ==__tls_get_addr: // CHECK: Creating thread 2 -// CHECK: __tls_get_addr +// CHECK: ==__tls_get_addr: // CHECK: Creating thread 3 -// CHECK: __tls_get_addr +// CHECK: ==__tls_get_addr: // Make sure that TLS slots don't leak // CHECK-NOT: num_live_dtls 5 // -// CHECK0-NOT: __tls_get_addr +// CHECK0-NOT: ==__tls_get_addr: /* cc=your-compiler -- 2.7.4