Add support for building with address, undefined, and thread sanitizers on linux

Signed-off-by: Rye <[email protected]>

Author: RyeMutt

indra/cmake/00-Common.cmake

@@ -143,14 +143,39 @@ if (LINUX)
           LL_IGNORE_SIGCHLD
   )
 
-  if(ENABLE_ASAN)
-    add_compile_options(-U_FORTIFY_SOURCE
-      -fsanitize=address
-      --param asan-stack=0
+  option(ENABLE_ASAN "Enable Address Sanitizer" OFF)
+  option(ENABLE_UBSAN "Enable Undefined Behavior Sanitizer" OFF)
+  option(ENABLE_THREADSAN "Enable Thread Sanitizer" OFF)
+  if(ENABLE_ASAN OR ENABLE_UBSAN OR ENABLE_THREADSAN)
+    set(GCC_DISABLE_FATAL_WARNINGS ON) # Disable warnings as errors during sanitizer builds due to false positives
+
+    add_compile_options(
+      -U_FORTIFY_SOURCE
+      -fno-omit-frame-pointer
+      -fno-common
+      -fsanitize-recover=all
     )
-    add_link_options(-fsanitize=address)
+
+    # libwebrtc is incompatible with sanitizers
+    set(DISABLE_WEBRTC ON)
+    add_compile_definitions(DISABLE_WEBRTC=1)
+
+    if(ENABLE_ASAN)
+      add_compile_options(-fsanitize=address)
+      add_link_options(-fsanitize=address)
+    endif()
+
+    if(ENABLE_UBSAN)
+      add_compile_options(-fsanitize=undefined)
+      add_link_options(-fsanitize=undefined)
+    endif()
+
+    if(ENABLE_THREADSAN)
+      add_compile_options(-fsanitize=thread)
+      add_link_options(-fsanitize=thread)
+    endif()
   else()
-   add_compile_definitions($<$<CONFIG:Release>:_FORTIFY_SOURCE=2>)
+    add_compile_definitions($<$<CONFIG:Release>:_FORTIFY_SOURCE=2>)
   endif()
 
   add_compile_options(

indra/llcommon/llinstancetracker.h

@@ -28,6 +28,8 @@
 #ifndef LL_LLINSTANCETRACKER_H
 #define LL_LLINSTANCETRACKER_H
 
+#include "llpreprocessor.h"
+
 #include <map>
 #include <set>
 #include <vector>
@@ -244,6 +246,9 @@ class LLInstanceTracker
     }
 
 protected:
+#if LL_CLANG || LL_GNUC
+    __attribute__((no_sanitize("vptr")))
+#endif
     LLInstanceTracker(const KEY& key)
     {
         // We do not intend to manage the lifespan of this object with
@@ -482,6 +487,9 @@ class LLInstanceTracker<T, void, KEY_COLLISION_BEHAVIOR>
     using key_snapshot_of = instance_snapshot_of<SUBCLASS>;
 
 protected:
+#if LL_CLANG || LL_GNUC
+    __attribute__((no_sanitize("vptr")))
+#endif
     LLInstanceTracker()
     {
         // Since we do not intend for this shared_ptr to manage lifespan, give

indra/newview/CMakeLists.txt

@@ -718,7 +718,6 @@ set(viewer_SOURCE_FILES
     llvoiceclient.cpp
     llvoicevisualizer.cpp
     llvoicevivox.cpp
-    llvoicewebrtc.cpp
     llvoinventorylistener.cpp
     llvopartgroup.cpp
     llvosky.cpp
@@ -1386,7 +1385,6 @@ set(viewer_HEADER_FILES
     llvoiceclient.h
     llvoicevisualizer.h
     llvoicevivox.h
-    llvoicewebrtc.h
     llvoinventorylistener.h
     llvopartgroup.h
     llvosky.h
@@ -1424,6 +1422,11 @@ source_group("CMake Rules" FILES ViewerInstall.cmake)
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt"
            "${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION}\n")
 
+if (NOT DISABLE_WEBRTC)
+  LIST(APPEND viewer_SOURCE_FILES llvoicewebrtc.cpp)
+  LIST(APPEND viewer_HEADER_FILES llvoicewebrtc.h)
+endif()
+
 if (DARWIN)
   LIST(APPEND viewer_SOURCE_FILES llappviewermacosx.cpp)
   LIST(APPEND viewer_SOURCE_FILES llappviewermacosx-objc.mm)
@@ -2014,7 +2017,6 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         llcorehttp
         llcommon
         llmeshoptimizer
-        llwebrtc
         lllogin
         llprimitive
         llappearance
@@ -2025,16 +2027,20 @@ target_link_libraries(${VIEWER_BINARY_NAME}
         ll::openxr
         )
 
+if (NOT DISABLE_WEBRTC)
+    target_link_libraries(${VIEWER_BINARY_NAME} llwebrtc )
+endif()
+
 if (USE_DISCORD)
-   target_link_libraries(${VIEWER_BINARY_NAME} ll::discord_sdk )
+    target_link_libraries(${VIEWER_BINARY_NAME} ll::discord_sdk )
 endif ()
 
 if( TARGET ll::intel_memops )
-   target_link_libraries(${VIEWER_BINARY_NAME} ll::intel_memops )
+    target_link_libraries(${VIEWER_BINARY_NAME} ll::intel_memops )
 endif()
 
 if( TARGET ll::nvapi )
-   target_link_libraries(${VIEWER_BINARY_NAME} ll::nvapi )
+    target_link_libraries(${VIEWER_BINARY_NAME} ll::nvapi )
 endif()
 
 if ( TARGET llconvexdecomposition )

indra/newview/linux_tools/wrapper.sh

@@ -18,6 +18,8 @@ export mesa_glthread=true
 ##   an unstripped binary before you run.
 #export LL_WRAPPER='gdb --args'
 #export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp'
+#export ASAN_OPTIONS="halt_on_error=0 detect_leaks=1 symbolize=1"
+#export UBSAN_OPTIONS="print_stacktrace=1 print_summary=1 halt_on_error=0"
 
 ## Nothing worth editing below this line.
 ##-------------------------------------------------------------------