remove assume from assert

Author: malytomas

cmake/cage_build_configuration.cmake

@@ -100,9 +100,4 @@ macro(cage_build_configuration)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-deprecated-declarations")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations")
 	endif()
-
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		# __builtin_assume has side effects that are discarded
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-assume")
-	endif()
 endmacro(cage_build_configuration)

sources/include/cage-core/core.h

@@ -8,14 +8,6 @@
 #include <type_traits>
 #include <utility>
 
-#if defined(_MSC_VER)
-	#define CAGE_ASSUME_TRUE(EXPR) __assume((bool)(EXPR))
-#elif defined(__clang__)
-	#define CAGE_ASSUME_TRUE(EXPR) __builtin_assume((bool)(EXPR))
-#else
-	#define CAGE_ASSUME_TRUE(EXPR)
-#endif
-
 #ifdef CAGE_ASSERT_ENABLED
 	#define CAGE_ASSERT(EXPR) \
 		{ \
@@ -25,13 +17,9 @@
 				int i_ = 42; \
 				(void)i_; \
 			} \
-			CAGE_ASSUME_TRUE(EXPR); \
 		}
 #else
-	#define CAGE_ASSERT(EXPR) \
-		{ \
-			CAGE_ASSUME_TRUE(EXPR); \
-		}
+	#define CAGE_ASSERT(EXPR) {}
 #endif
 
 #define CAGE_THROW_SILENT(EXCEPTION, ...) \

sources/libcore/errors/crashHandlerLinux.cpp

@@ -151,11 +151,17 @@ namespace cage
 			{
 				case SIGTERM:
 					if (sigTermHandler)
+					{
 						sigTermHandler();
+						return; // already handled, do not call default handler
+					}
 					break;
 				case SIGINT:
 					if (sigIntHandler)
+					{
 						sigIntHandler();
+						return; // already handled, do not call default handler
+					}
 					break;
 			}