From 2d9b5a39e8ba1808c0e5430bacae40359298571a Mon Sep 17 00:00:00 2001
From: Pratik Mankawde <3397372+pratikmankawde@users.noreply.github.com>
Date: Fri, 20 Mar 2026 15:39:06 +0000
Subject: [PATCH] fix: Separate ASAN+UBSAN and TSAN+UBSAN into independent CI
 jobs

Combined ASAN+UBSAN instrumentation inflates data sections past 2GB,
colliding with ASAN's fixed shadow memory layout at 0x7fff8000+.
Split into independent ASAN, TSAN, and UBSAN jobs per compiler to
keep each binary within the shadow memory limit.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .github/scripts/strategy-matrix/generate.py | 36 ++++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index 7a2e0b459d..dcda12ead8 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -234,43 +234,58 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         # Add the configuration to the list, with the most unique fields first,
         # so that they are easier to identify in the GitHub Actions UI, as long
         # names get truncated.
-        # Add Address and Thread (both coupled with UB) sanitizers for specific bookworm distros.
-        # GCC-Asan rippled-embedded tests are failing because of https://github.com/google/sanitizers/issues/856
+        # Add ASAN, TSAN, and UBSAN sanitizer jobs for specific bookworm distros.
+        # Each sanitizer runs independently to keep binary size under ASAN's
+        # 2GB shadow memory limit (combining ASAN+UBSAN inflates data sections
+        # past 2GB, see https://github.com/google/sanitizers/issues/856).
         if os[
             "distro_version"
         ] == "bookworm" and f"{os['compiler_name']}-{os['compiler_version']}" in [
             "clang-20",
             "gcc-13",
         ]:
-            # Add ASAN + UBSAN configuration.
+            # Add ASAN configuration.
             configurations.append(
                 {
-                    "config_name": config_name + "-asan-ubsan",
+                    "config_name": config_name + "-asan",
                     "cmake_args": cmake_args,
                     "cmake_target": cmake_target,
                     "build_only": build_only,
                     "build_type": build_type,
                     "os": os,
                     "architecture": architecture,
-                    "sanitizers": "address,undefinedbehavior",
+                    "sanitizers": "address",
                 }
             )
-            # Add TSAN + UBSAN configuration.
+            # Add TSAN configuration.
             # TSAN instrumentation significantly increases memory usage during
             # compilation, so reduce build parallelism to avoid OOM on CI runners.
             configurations.append(
                 {
-                    "config_name": config_name + "-tsan-ubsan",
+                    "config_name": config_name + "-tsan",
                     "cmake_args": cmake_args,
                     "cmake_target": cmake_target,
                     "build_only": build_only,
                     "build_type": build_type,
                     "os": os,
                     "architecture": architecture,
-                    "sanitizers": "thread,undefinedbehavior",
+                    "sanitizers": "thread",
                     "nproc_subtract": 20,
                 }
             )
+            # Add UBSAN configuration.
+            configurations.append(
+                {
+                    "config_name": config_name + "-ubsan",
+                    "cmake_args": cmake_args,
+                    "cmake_target": cmake_target,
+                    "build_only": build_only,
+                    "build_type": build_type,
+                    "os": os,
+                    "architecture": architecture,
+                    "sanitizers": "undefinedbehavior",
+                }
+            )
         else:
             configurations.append(
                 {
@@ -291,10 +306,7 @@ def generate_strategy_matrix(all: bool, config: Config) -> list:
         c
         for c in configurations
         if c["sanitizers"]
-        and (
-            ("gcc-13" in c["config_name"] and "asan" in c["config_name"])
-            or ("clang-20" in c["config_name"] and "tsan" in c["config_name"])
-        )
+        and ("gcc-13" in c["config_name"] or "clang-20" in c["config_name"])
     ]
     if sanitizer_only:
         return sanitizer_only