Author: Sergei Druzhkov Date: 2026-02-20T14:57:32+03:00 New Revision: 459acd142618e926e074f1954a34f784df2b16f2
URL: https://github.com/llvm/llvm-project/commit/459acd142618e926e074f1954a34f784df2b16f2 DIFF: https://github.com/llvm/llvm-project/commit/459acd142618e926e074f1954a34f784df2b16f2.diff LOG: Reland "[lldb] Fix TSan report" (#181004) Reland "[lldb] Fix TSan report". Added: Modified: lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py Removed: ################################################################################ diff --git a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp index 04dd825519d35..74bd3ca25bc6f 100644 --- a/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp +++ b/lldb/source/Plugins/InstrumentationRuntime/TSan/InstrumentationRuntimeTSan.cpp @@ -88,7 +88,12 @@ extern "C" // TODO: dlsym won't work on Windows. void *dlsym(void* handle, const char* symbol); int (*ptr__tsan_get_report_loc_object_type)(void *report, unsigned long idx, const char **object_type); -} +#if defined(__linux__) +#define RTLD_DEFAULT ((void *) 0) +#else +#define RTLD_DEFAULT ((void *) -2) +#endif + } )"; const char *thread_sanitizer_retrieve_report_data_command = R"( @@ -161,7 +166,7 @@ struct { } unique_tids[REPORT_ARRAY_SIZE]; } t = {0}; -ptr__tsan_get_report_loc_object_type = (typeof(ptr__tsan_get_report_loc_object_type))(void *)dlsym((void*)-2 /*RTLD_DEFAULT*/, "__tsan_get_report_loc_object_type"); +ptr__tsan_get_report_loc_object_type = (typeof(ptr__tsan_get_report_loc_object_type))(void *)dlsym(RTLD_DEFAULT, "__tsan_get_report_loc_object_type"); t.report = __tsan_get_current_report(); __tsan_get_report_data(t.report, &t.description, &t.report_count, &t.stack_count, &t.mop_count, &t.loc_count, &t.mutex_count, &t.thread_count, &t.unique_tid_count, t.sleep_trace, REPORT_TRACE_SIZE); diff --git a/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py b/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py index ed65f68c1551c..356e09d33fa08 100644 --- a/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py +++ b/lldb/test/API/functionalities/tsan/cpp_global_location/TestTsanCPPGlobalLocation.py @@ -10,10 +10,6 @@ class TsanCPPGlobalLocationTestCase(TestBase): - @expectedFailureAll( - oslist=["linux"], - bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)", - ) @expectedFailureNetBSD @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote diff --git a/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py b/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py index 6fced5bae752a..1c02785977922 100644 --- a/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py +++ b/lldb/test/API/functionalities/tsan/global_location/TestTsanGlobalLocation.py @@ -10,10 +10,6 @@ class TsanGlobalLocationTestCase(TestBase): - @expectedFailureAll( - oslist=["linux"], - bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)", - ) @expectedFailureNetBSD @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote diff --git a/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py b/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py index aa2d1d9feadc0..d73157603018d 100644 --- a/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py +++ b/lldb/test/API/functionalities/tsan/multiple/TestTsanMultiple.py @@ -10,10 +10,6 @@ class TsanMultipleTestCase(TestBase): - @expectedFailureAll( - oslist=["linux"], - bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)", - ) @expectedFailureNetBSD @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote diff --git a/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py b/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py index 2f5cceb7873c7..fe995935ea4ef 100644 --- a/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py +++ b/lldb/test/API/functionalities/tsan/thread_leak/TestTsanThreadLeak.py @@ -9,10 +9,6 @@ class TsanThreadLeakTestCase(TestBase): - @expectedFailureAll( - oslist=["linux"], - bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)", - ) @expectedFailureNetBSD @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote diff --git a/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py b/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py index 8fc1ae64c267e..68e9a064793bb 100644 --- a/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py +++ b/lldb/test/API/functionalities/tsan/thread_numbers/TestTsanThreadNumbers.py @@ -10,10 +10,6 @@ class TsanThreadNumbersTestCase(TestBase): - @expectedFailureAll( - oslist=["linux"], - bugnumber="non-core functionality, need to reenable and fix later (DES 2014.11.07)", - ) @expectedFailureNetBSD @skipIfFreeBSD # llvm.org/pr21136 runtimes not yet available by default @skipIfRemote _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
