Use UBSan for release builds (trikset#1733)

* Always build with UBSan * Disable some advanced UBSan sub-options ... not recognized by GCC 8.1 * Use GCC 7.3 compatible option for USan * Allow global TRIK_SANITIZE_UNDEFINED_FLAGS * Add UbSan for Windows and rename main.yml to windows_build_with_installer.yml
iakov · Jul 30, 2024 · 381ac5b · 381ac5b
1 parent 63e13e7
commit 381ac5b
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/.github/workflows/main.yml → ...orkflows/windows_build_with_installer.yml b/.github/workflows/main.yml → ...orkflows/windows_build_with_installer.yml
@@ -1,4 +1,4 @@
-name: GHA CI
+name: Windows build
 on:
   push:
     branches-ignore:
@@ -138,7 +138,7 @@ jobs:
         timeout-minutes: 1
         run: |
             cd ${{ env.BUILD_DIR }}
-            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=release CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" # CONFIG+=silent
+            qmake $GITHUB_WORKSPACE/studio.pro -spec win32-g++ CONFIG+=release CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=tests CONFIG+=noPch PYTHON_PATH="${pythonLocation}" # CONFIG+=silent
 
       - name: QMake all
         timeout-minutes: 5

diff --git a/global.pri b/global.pri
@@ -133,7 +133,7 @@ equals(TEMPLATE, lib) {
 	CONFIG += sanitizer
 }
 
-unix:!nosanitizers {
+!nosanitizers {
 
 	# seems like we want USan always, but are afraid of ....
 	!CONFIG(sanitize_address):!CONFIG(sanitize_thread):!CONFIG(sanitize_memory):!CONFIG(sanitize_kernel_address) {
@@ -143,20 +143,25 @@ unix:!nosanitizers {
 
 
 	#LSan can be used without performance degrade even in release build
-	#But at the moment we can not, because of Qt  problems
-        !macx-clang:CONFIG(debug):!CONFIG(sanitize_address):!CONFIG(sanitize_memory):!CONFIG(sanitize_thread) { CONFIG += sanitize_leak }
+	#But at the moment we can not, because of Qt and MinGW problems
+        !win32:!macx-clang:CONFIG(debug):!CONFIG(sanitize_address):!CONFIG(sanitize_memory):!CONFIG(sanitize_thread) { CONFIG += sanitize_leak }
 
 	sanitize_leak {
-		QMAKE_CFLAGS += -fsanitize=leak
-		QMAKE_CXXFLAGS += -fsanitize=leak
-		QMAKE_LFLAGS += -fsanitize=leak
+		QMAKE_CFLAGS *= -fsanitize=leak
+		QMAKE_CXXFLAGS *= -fsanitize=leak
+		QMAKE_LFLAGS *= -fsanitize=leak
 	}
 
-	sanitize_undefined:macx-clang {
-		# sometimes runtime is missing in clang. this hack allows to avoid runtime dependency.
-		#QMAKE_SANITIZE_UNDEFINED_CFLAGS += -fsanitize-trap=undefined
-		#QMAKE_SANITIZE_UNDEFINED_CXXFLAGS += -fsanitize-trap=undefined
-		#QMAKE_SANITIZE_UNDEFINED_LFLAGS += -fsanitize-trap=undefined
+        sanitize_undefined {
+	        #TRIK_SANITIZE_UNDEFINED_FLAGS += \
+                #-fsanitize=undefined,float-divide-by-zero,unsigned-integer-overflow,implicit-conversion,local-bounds
+
+		# This hack allows to avoid runtime dependency.
+	        win32:isEmpty(TRIK_SANITIZE_UNDEFINED_FLAGS):TRIK_SANITIZE_UNDEFINED_FLAGS = -fsanitize-undefined-trap-on-error
+
+                QMAKE_SANITIZE_UNDEFINED_CFLAGS *= $$TRIK_SANITIZE_UNDEFINED_FLAGS
+		QMAKE_SANITIZE_UNDEFINED_CXXFLAGS *= $$TRIK_SANITIZE_UNDEFINED_FLAGS
+		QMAKE_SANITIZE_UNDEFINED_LFLAGS *= $$TRIK_SANITIZE_UNDEFINED_FLAGS
 	}
 
         sanitize_memory {
@@ -165,15 +170,16 @@ unix:!nosanitizers {
 
         }
 
+        unix {
+                QMAKE_CFLAGS_RELEASE += -fsanitize-recover=all
+                QMAKE_CXXFLAGS_RELEASE += -fsanitize-recover=all
 
-        QMAKE_CFLAGS_RELEASE += -fsanitize-recover=all
-        QMAKE_CXXFLAGS_RELEASE += -fsanitize-recover=all
+                QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -fno-sanitize-recover=all
+                QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -fno-sanitize-recover=all
 
-        QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -fno-sanitize-recover=all
-        QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -fno-sanitize-recover=all
-
-        QMAKE_CFLAGS_DEBUG  += -fno-sanitize-recover=all
-        QMAKE_CXXFLAGS_DEBUG += -fno-sanitize-recover=all
+                QMAKE_CFLAGS_DEBUG  += -fno-sanitize-recover=all
+                QMAKE_CXXFLAGS_DEBUG += -fno-sanitize-recover=all
+        }
 }
 
 OBJECTS_DIR = .build/$$CONFIGURATION/obj

diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime
diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro b/plugins/robots/thirdparty/trikRuntime/trikRuntime.pro
@@ -16,6 +16,7 @@ TEMPLATE = subdirs
 include(../../../../global.pri)
 
 SUBDIRS += \
+	trikRuntimeQsLog \
 	trikKernel \
 	trikNetwork \
 	trikControl \
@@ -26,7 +27,7 @@ SUBDIRS += \
 
 tests {
 	SUBDIRS *= tests
-	tests.depends = trikScriptRunner trikCommunicator trikKernel
+	tests.depends = trikScriptRunner trikCommunicator trikKernel trikRuntimeQsLog
 	tests.subdir = $$PWD/trikRuntime/tests
 }
 
@@ -43,8 +44,9 @@ trikNetwork.subdir = $$PWD/trikRuntime/trikNetwork
 trikControl.subdir = $$PWD/trikRuntime/trikControl
 translations.subdir = $$PWD/trikRuntime/translations
 trikHal.subdir = $$PWD/trikRuntime/trikHal
+trikRuntimeQsLog.file = $$PWD/trikRuntime/qslog/QsLogSharedLibrary.pro
 trikControl.depends = trikKernel trikHal
-trikKernel.depends =
+trikKernel.depends = trikRuntimeQsLog
 trikNetwork.depends = trikKernel
 trikScriptRunner.depends += trikControl trikKernel trikNetwork
 trikHal.depends = trikKernel