From 3040830fcd40a0a00f954def1cbc65c66216c1ca Mon Sep 17 00:00:00 2001 From: Alexey Samsonov Date: Tue, 18 Sep 2012 08:33:37 +0000 Subject: [TSan] fix a typo in test dependencies. Silence few remaining pedantic gcc warnings in TSan tests. llvm-svn: 164115 --- compiler-rt/lib/tsan/tests/rtl/tsan_test.cc | 10 ++++++++-- compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'compiler-rt/lib/tsan/tests/rtl') diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc index 71641400efe..50fee84ace3 100644 --- a/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc +++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test.cc @@ -28,11 +28,13 @@ TEST(ThreadSanitizer, FuncCall) { t2.Return(); } -int main(int argc, char **argv) { +// We use this function instead of main, as ISO C++ forbids taking the address +// of main, which we need to pass inside __tsan_func_entry. +int run_tests(int argc, char **argv) { TestMutexBeforeInit(); // Mutexes must be usable before __tsan_init(); __tsan_init(); __tsan_func_entry(__builtin_return_address(0)); - __tsan_func_entry((char*)&main + 1); + __tsan_func_entry((void*)((uintptr_t)&run_tests + 1)); testing::GTEST_FLAG(death_test_style) = "threadsafe"; testing::InitGoogleTest(&argc, argv); @@ -42,3 +44,7 @@ int main(int argc, char **argv) { __tsan_func_exit(); return res; } + +int main(int argc, char **argv) { + return run_tests(argc, argv); +} diff --git a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc index 5bc393bf6c2..dce8db90de7 100644 --- a/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc +++ b/compiler-rt/lib/tsan/tests/rtl/tsan_test_util_linux.cc @@ -397,7 +397,7 @@ void ScopedThread::VptrUpdate(const MemLoc &vptr, } void ScopedThread::Call(void(*pc)()) { - Event event(Event::CALL, (void*)pc); + Event event(Event::CALL, (void*)((uintptr_t)pc)); impl_->send(&event); } -- cgit v1.2.1