Improved UBSAN support for gcc too + added a macro to disable tests t…

…hat have to trigger UBSAN.

include/mockutils/Macros.hpp

@@ -20,3 +20,9 @@
 #else
 #   define FAKEIT_CPLUSPLUS __cplusplus
 #endif
+
+#ifdef __GNUG__
+#   define FAKEIT_DISARM_UBSAN __attribute__((no_sanitize("undefined")))
+#else
+#   define FAKEIT_DISARM_UBSAN
+#endif

include/mockutils/VTUtils.hpp

@@ -10,6 +10,7 @@
 
 #include <functional>
 #include <type_traits>
+#include "mockutils/Macros.hpp"
 #include "mockutils/VirtualOffestSelector.hpp"
 #include "mockutils/union_cast.hpp"
 
@@ -37,10 +38,8 @@ namespace fakeit {
 #endif
 
         template<typename C>
+        FAKEIT_DISARM_UBSAN
         static typename std::enable_if<std::has_virtual_destructor<C>::value, unsigned int>::type
-#if defined(__clang__)
-__attribute__((no_sanitize("undefined")))
-#endif
         getDestructorOffset() {
             VirtualOffsetSelector offsetSelctor;
             union_cast<C *>(&offsetSelctor)->~C();

tests/default_behaviore_tests.cpp

@@ -22,9 +22,13 @@ struct DefaultBehavioreTests : tpunit::TestFixture {
 			TEST(DefaultBehavioreTests::DefaultBeaviorOfVoidFunctionsIsToDoNothing), //
 			TEST(DefaultBehavioreTests::ReturnByValue_ReturnDefaultConstructedObject), //
 			TEST(DefaultBehavioreTests::ReturnByValue_ThrowExceptionIfNotDefaultConstructible), //
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 			TEST(DefaultBehavioreTests::ReturnByReference_ReturnReferenceToNullIfAbstract), //
+#endif
 			TEST(DefaultBehavioreTests::ReturnByReference_ReturnReferenceToDefaultConstructedObject), //
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 			TEST(DefaultBehavioreTests::ReturnByReference_ReturnReferenceToNullIfNotDefaultConstructible), //
+#endif
 			TEST(DefaultBehavioreTests::ReturnPtr_NullPtrIfPtrToAbstract),
 			TEST(DefaultBehavioreTests::production_shared_ptr_mock_used_in_invocation)
 			//TEST(DefaultBehavioreTests::should_survive_delete_of_mock_instance_by_user)

tests/referece_types_tests.cpp

@@ -57,30 +57,41 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 
 	void implicitStubbingDefaultReturnValues() {
 		Mock<ReferenceInterface> mock;
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		Fake( //
 				Method(mock,returnIntByRef), //
 				Method(mock,returnAbstractTypeByRef), //
 				Method(mock,returnConcreteTypeByRef) //
 				);
+#else
+		Fake( //
+				Method(mock,returnIntByRef), //
+				Method(mock,returnConcreteTypeByRef) //
+				);
+#endif
 
 		ReferenceInterface & i = mock.get();
 
 		// Fundamental types are initiated to 0.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(0, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(ConcreteType(), i.returnConcreteTypeByRef());
 
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		// For abstract types return a reference to nullptr.
 		ASSERT_EQUAL(nullptr, &i.returnAbstractTypeByRef());
+#endif
 	}
 
 	void explicitStubbingDefualtReturnValues() {
 		Mock<ReferenceInterface> mock;		//
 		When(Method(mock,returnIntByRef)).Return(); //
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		When(Method(mock,returnAbstractTypeByRef)).Return(); //
+#endif
 		When(Method(mock,returnConcreteTypeByRef)).Return(); //
 
 		ReferenceInterface & i = mock.get();
@@ -89,12 +100,14 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 		// Return a reference to the default value.
 		ASSERT_EQUAL(0, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(ConcreteType(), i.returnConcreteTypeByRef());
 
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		// For abstract types return a reference to nullptr.
 		ASSERT_EQUAL(nullptr, &i.returnAbstractTypeByRef());
+#endif
 	}
 
 	void explicitStubbingReturnValues() {
@@ -113,7 +126,7 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 		// Return a reference to the default value.
 		ASSERT_EQUAL(1, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(&c, &i.returnConcreteTypeByRef());
 
@@ -137,7 +150,7 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 		// Return a reference to the default value.
 		ASSERT_EQUAL(1, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(&c, &i.returnConcreteTypeByRef());
 
@@ -161,7 +174,7 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 		// Return a reference to the default value.
 		ASSERT_EQUAL(1, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(&c, &i.returnConcreteTypeByRef());
 
@@ -172,7 +185,9 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 	void explicitStubbingDefualtReturnValues_with_AlwaysReturn() {
 		Mock<ReferenceInterface> mock;
 		When(Method(mock,returnIntByRef)).AlwaysReturn();
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		When(Method(mock,returnAbstractTypeByRef)).AlwaysReturn(); //
+#endif
 		When(Method(mock,returnConcreteTypeByRef)).AlwaysReturn(); //
 
 		ReferenceInterface & i = mock.get();
@@ -181,13 +196,14 @@ struct ReferenceTypesTests: tpunit::TestFixture {
 		// Return a reference to the default value.
 		ASSERT_EQUAL(0, i.returnIntByRef());
 
-		// Concrete types types are initiated by default ctor.
+		// Concrete types are initiated by default ctor.
 		// Return a reference to the default value.
 		ASSERT_EQUAL(ConcreteType(), i.returnConcreteTypeByRef());
 
+#ifndef FAKEIT_DISABLE_UBSAN_TRIGGERING_TESTS
 		// For abstract types return a reference to nullptr.
 		ASSERT_EQUAL(nullptr, &i.returnAbstractTypeByRef());
+#endif
 	}
 
 } __ReferenceTypesTests;
-

tests/stubbing_tests.cpp

@@ -9,8 +9,6 @@
 #include <string>
 #include <queue>
 
-#include "mockutils/Macros.hpp"
-
 #include "tpunit++.hpp"
 #include "fakeit.hpp"