dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Only blacklist the TSAN file when using clang compiler (#1713)

Browse source 
* Only use -fsanitize-blacklist with Clang

* Instead check if the compiler flag exists

* Remove deprecated exception specification warning

* Didn't work, go back to checking for Clang

* cleanup
This commit is contained in:
Wesley Shillingford 2019-02-16 10:34:44 +00:00 • committed by GitHub
commit 2331c69d76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -49,7 +49,10 @@ else ()
add_compile_options(-fsanitize=address,undefined,integer) add_compile_options(-fsanitize=address,undefined,integer)
add_definitions(-DED25519_NO_INLINE_ASM) add_definitions(-DED25519_NO_INLINE_ASM)
elseif (NANO_TSAN OR RAIBLOCKS_TSAN) elseif (NANO_TSAN OR RAIBLOCKS_TSAN)
add_compile_options(-fsanitize=thread "-fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist") add_compile_options(-fsanitize=thread)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options("-fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
endif()
add_definitions(-DED25519_NO_INLINE_ASM) add_definitions(-DED25519_NO_INLINE_ASM)
endif() endif()
@ -108,7 +111,10 @@ else ()
elseif (NANO_ASAN_INT OR RAIBLOCKS_ASAN_INT) elseif (NANO_ASAN_INT OR RAIBLOCKS_ASAN_INT)
set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=address,undefined,integer") set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=address,undefined,integer")
elseif (NANO_TSAN OR RAIBLOCKS_TSAN) elseif (NANO_TSAN OR RAIBLOCKS_TSAN)
set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=thread -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist") set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize=thread")
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set (PLATFORM_LINK_FLAGS "${PLATFORM_LINK_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tsan_blacklist")
endif()
endif() endif()
endif () endif ()

2
nano/lib/blocks.hpp
View file

@ -26,7 +26,7 @@ bool try_read (nano::stream & stream_a, T & value)
} }
// A wrapper of try_read which throws if there is an error // A wrapper of try_read which throws if there is an error
template <typename T> template <typename T>
void read (nano::stream & stream_a, T & value) throw (std::runtime_error) void read (nano::stream & stream_a, T & value)
{ {
auto error = try_read (stream_a, value); auto error = try_read (stream_a, value);
if (error) if (error)