clang-tool-chain 1.1.2__py3-none-any.whl → 1.1.4__py3-none-any.whl

clang_tool_chain/__version__.py

@@ -1,3 +1,3 @@
 """Version information for clang-tool-chain."""
 
-__version__ = "1.1.2"
+__version__ = "1.1.4"

clang_tool_chain/env_utils.py

@@ -26,13 +26,20 @@ CONTROLLABLE_FEATURES = {
     "DIRECTIVES": "Inlined build directives (@link, @std, @cflags)",
     "SHARED_ASAN": "Automatic -shared-libasan injection (Linux)",
     "SANITIZER_ENV": "Automatic ASAN_OPTIONS/LSAN_OPTIONS injection",
-    "SANITIZER_NOTE": "Sanitizer flag injection note to stderr",
     "RPATH": "Automatic rpath injection for library loading",
     "SYSROOT": "Automatic macOS SDK detection (-isysroot)",
     "DEPLOY_LIBS": "Cross-platform library deployment (all outputs)",
     "DEPLOY_SHARED_LIB": "Library deployment for shared library outputs only (.dll, .so, .dylib)",
     "BUNDLED_UNWIND": "Bundled libunwind paths on Linux",
     "MACOS_UNWIND_FIX": "Automatic -lunwind removal on macOS (libunwind in libSystem)",
+    # Sanitizer notes (hierarchical)
+    "SANITIZER_NOTE": "All sanitizer-related notes (category master)",
+    "SHARED_ASAN_NOTE": "-shared-libasan injection note",
+    "ALLOW_SHLIB_UNDEFINED_NOTE": "-Wl,--allow-shlib-undefined injection note",
+    # Linker notes (hierarchical)
+    "LINKER_NOTE": "All linker-related notes (category master)",
+    "LINKER_COMPAT_NOTE": "Removed GNU linker flags note",
+    "LD64_LLD_CONVERT_NOTE": "-fuse-ld=ld64.lld conversion note",
 }
 
 
@@ -137,3 +144,54 @@ def log_disabled_features_summary() -> None:
         logger.info("All automatic features disabled via CLANG_TOOL_CHAIN_NO_AUTO=1")
     else:
         logger.info(f"Disabled features: {', '.join(disabled)}")
+
+
+def is_note_disabled(specific: str, category: str | None = None) -> bool:
+    """
+    Check if a specific note is disabled using hierarchical suppression.
+
+    A note is disabled if ANY of:
+    1. CLANG_TOOL_CHAIN_NO_AUTO=1 (global master)
+    2. CLANG_TOOL_CHAIN_NO_{category}=1 (category master, if provided)
+    3. CLANG_TOOL_CHAIN_NO_{specific}=1 (specific note)
+
+    This allows users to:
+    - Disable all automatic features with NO_AUTO=1
+    - Disable a category of notes (e.g., all sanitizer notes) with NO_SANITIZER_NOTE=1
+    - Disable a specific note with its dedicated variable (e.g., NO_SHARED_ASAN_NOTE=1)
+
+    Args:
+        specific: The specific note name (e.g., "SHARED_ASAN_NOTE")
+        category: Optional category master (e.g., "SANITIZER_NOTE")
+
+    Returns:
+        True if the note should be suppressed
+
+    Example:
+        >>> os.environ["CLANG_TOOL_CHAIN_NO_SANITIZER_NOTE"] = "1"
+        >>> is_note_disabled("SHARED_ASAN_NOTE", "SANITIZER_NOTE")
+        True  # Disabled via category
+
+        >>> os.environ["CLANG_TOOL_CHAIN_NO_SHARED_ASAN_NOTE"] = "1"
+        >>> is_note_disabled("SHARED_ASAN_NOTE", "SANITIZER_NOTE")
+        True  # Disabled via specific variable
+    """
+    # Check the global master (NO_AUTO)
+    if is_auto_disabled():
+        logger.debug(f"Note {specific} disabled via CLANG_TOOL_CHAIN_NO_AUTO=1")
+        return True
+
+    # Check the category master (if provided)
+    if category:
+        var_name = f"CLANG_TOOL_CHAIN_NO_{category}"
+        if _is_truthy(os.environ.get(var_name)):
+            logger.debug(f"Note {specific} disabled via {var_name}=1 (category master)")
+            return True
+
+    # Check the specific note variable
+    var_name = f"CLANG_TOOL_CHAIN_NO_{specific}"
+    if _is_truthy(os.environ.get(var_name)):
+        logger.debug(f"Note {specific} disabled via {var_name}=1")
+        return True
+
+    return False

clang_tool_chain/execution/arg_transformers.py

@@ -39,7 +39,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from clang_tool_chain.env_utils import is_feature_disabled
+from clang_tool_chain.env_utils import is_feature_disabled, is_note_disabled
 
 if TYPE_CHECKING:
     from clang_tool_chain.directives.parser import ParsedDirectives
@@ -487,11 +487,20 @@ class ASANRuntimeTransformer(ArgumentTransformer):
                 result = ["-Wl,--allow-shlib-undefined"] + result
                 injected_flags.append("-Wl,--allow-shlib-undefined")
 
-        # Warn on stderr if we injected flags (unless disabled)
-        if injected_flags and not is_feature_disabled("SANITIZER_NOTE"):
+        # Emit individual notes for each injected flag (hierarchical suppression)
+        if "-shared-libasan" in injected_flags and not is_note_disabled("SHARED_ASAN_NOTE", "SANITIZER_NOTE"):
             print(
-                f"clang-tool-chain: note: automatically injected sanitizer flags: {' '.join(injected_flags)} "
-                "(disable with CLANG_TOOL_CHAIN_NO_SANITIZER_NOTE=1)",
+                "clang-tool-chain: note: automatically injected -shared-libasan for ASAN runtime linking "
+                "(disable with CLANG_TOOL_CHAIN_NO_SHARED_ASAN_NOTE=1)",
+                file=sys.stderr,
+            )
+
+        if "-Wl,--allow-shlib-undefined" in injected_flags and not is_note_disabled(
+            "ALLOW_SHLIB_UNDEFINED_NOTE", "SANITIZER_NOTE"
+        ):
+            print(
+                "clang-tool-chain: note: automatically injected -Wl,--allow-shlib-undefined for shared library ASAN "
+                "(disable with CLANG_TOOL_CHAIN_NO_ALLOW_SHLIB_UNDEFINED_NOTE=1)",
                 file=sys.stderr,
             )
 

clang_tool_chain/execution/sanitizer_env.py

@@ -160,9 +160,10 @@ def prepare_sanitizer_environment(
         compiler_flags: List of compiler flags used to build the executable.
             Used to detect which sanitizers are enabled. If None, no options
             are injected (safe default).
-        suppression_file: Optional path to custom LSan suppression file.
-            If None, uses built-in platform-specific suppressions.
-            Set to empty string "" to disable built-in suppressions.
+        suppression_file: Optional path to additional custom LSan suppression file.
+            If provided, this file is merged with built-in platform-specific
+            suppressions (built-in applied first, then custom).
+            Set to empty string "" to disable built-in suppressions entirely.
 
     Returns:
         Environment dictionary with sanitizer options injected as appropriate.
@@ -184,7 +185,7 @@ def prepare_sanitizer_environment(
         ...     compiler_flags=["-fsanitize=address"],
         ...     suppression_file="/path/to/custom.txt"
         ... )
-        >>> # Uses custom suppression file instead of built-in
+        >>> # Uses BOTH built-in AND custom suppression files (merged)
     """
     env = base_env.copy() if base_env is not None else os.environ.copy()
 
@@ -225,22 +226,33 @@ def prepare_sanitizer_environment(
 
     # Add platform-specific LSan suppressions if LSAN is enabled
     if lsan_enabled:
-        # Use built-in suppression file if no custom file specified
-        if suppression_file is None:
-            suppression_file = _get_builtin_suppression_file()
+        # Check if user explicitly disabled built-in suppressions with ""
+        disable_builtin = suppression_file == ""
 
-        # Apply suppression file if it exists (unless explicitly disabled with "")
-        if suppression_file and suppression_file != "" and Path(suppression_file).exists():
+        # Helper to append suppression file to LSAN_OPTIONS
+        def _append_suppression(file_path: Path) -> None:
             current_lsan = env.get("LSAN_OPTIONS", "")
-            suppression_opt = f"suppressions={Path(suppression_file).absolute()}"
+            suppression_opt = f"suppressions={file_path.absolute()}"
 
             if current_lsan:
-                # Append to existing options
                 env["LSAN_OPTIONS"] = f"{current_lsan}:{suppression_opt}"
             else:
-                # Set new options
                 env["LSAN_OPTIONS"] = suppression_opt
 
-            logger.info(f"Injecting LSan suppression file: {suppression_file}")
+            logger.info(f"Injecting LSan suppression file: {file_path}")
+
+        # First, apply built-in platform-specific suppressions (unless disabled)
+        if not disable_builtin:
+            builtin_file = _get_builtin_suppression_file()
+            if builtin_file and builtin_file.exists():
+                _append_suppression(builtin_file)
+
+        # Then, also apply custom suppression file if provided (merge behavior)
+        if suppression_file and suppression_file != "":
+            custom_path = Path(suppression_file)
+            if custom_path.exists():
+                _append_suppression(custom_path)
+            else:
+                logger.warning(f"Custom suppression file not found: {suppression_file}")
 
     return env

clang_tool_chain/linker/lld.py

@@ -12,7 +12,7 @@ import logging
 import os
 import sys
 
-from clang_tool_chain.env_utils import is_feature_disabled
+from clang_tool_chain.env_utils import is_note_disabled
 from clang_tool_chain.interrupt_utils import handle_keyboard_interrupt_properly
 from clang_tool_chain.llvm_versions import get_llvm_version_tuple, supports_ld64_lld_flag
 
@@ -272,10 +272,8 @@ def _translate_linker_flags_for_macos_lld(args: list[str]) -> list[str]:
 
         i += 1
 
-    # Emit warning for removed flags (unless silenced)
-    if removed_flags and not is_feature_disabled("LINKER_COMPAT_NOTE"):
-        import sys
-
+    # Emit warning for removed flags (unless silenced via hierarchical suppression)
+    if removed_flags and not is_note_disabled("LINKER_COMPAT_NOTE", "LINKER_NOTE"):
         print(
             f"clang-tool-chain: note: removed GNU linker flags not supported by ld64.lld: "
             f"{', '.join(removed_flags)} (disable with CLANG_TOOL_CHAIN_NO_LINKER_COMPAT_NOTE=1)",
@@ -379,11 +377,13 @@ def _add_lld_linker_if_needed(platform_name: str, args: list[str]) -> list[str]:
         # Check if user specified -fuse-ld=ld64.lld (which is not a valid clang driver option)
         # and emit a warning about the auto-conversion to -fuse-ld=lld
         if _user_specified_ld64_lld(args):
-            print(
-                "[clang-tool-chain] Warning: -fuse-ld=ld64.lld is not a valid clang driver option. "
-                "Auto-converting to -fuse-ld=lld (clang driver auto-dispatches to ld64.lld on Darwin).",
-                file=sys.stderr,
-            )
+            if not is_note_disabled("LD64_LLD_CONVERT_NOTE", "LINKER_NOTE"):
+                print(
+                    "clang-tool-chain: warning: -fuse-ld=ld64.lld is not a valid clang driver option. "
+                    "Auto-converting to -fuse-ld=lld (clang driver auto-dispatches to ld64.lld on Darwin). "
+                    "(disable with CLANG_TOOL_CHAIN_NO_LD64_LLD_CONVERT_NOTE=1)",
+                    file=sys.stderr,
+                )
             args = _convert_ld64_lld_to_lld(args)
 
         return _translate_linker_flags_for_macos_lld(args)

{clang_tool_chain-1.1.2.dist-info → clang_tool_chain-1.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clang-tool-chain
-Version: 1.1.2
+Version: 1.1.4
 Summary: Clang Tool Chain - C/C++ compilation toolchain utilities
 Project-URL: Homepage, https://github.com/zackees/clang-tool-chain
 Project-URL: Repository, https://github.com/zackees/clang-tool-chain

{clang_tool_chain-1.1.2.dist-info → clang_tool_chain-1.1.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 clang_tool_chain/__init__.py,sha256=u-qgOuQxh5W2g7n8BgUtBnUWsK66rM4N6LJXY9PiEx0,880
-clang_tool_chain/__version__.py,sha256=QdDf2Y_Q6wfrydeJ6-C_vCqCore3Rs1Q1qnCfaTFRNQ,71
+clang_tool_chain/__version__.py,sha256=OZTe0l-1KRXG_B5GhtooBTlUxPJy68FJ5pyGG4KC95U,71
 clang_tool_chain/archive.py,sha256=t3reh7cm5XP2rhTqfRIDAQZv5XQq7SsstyiROYg8wFA,27697
 clang_tool_chain/archive_cache.py,sha256=5ZmlwXIJZDcrDFkTbdgBQYN9sulGn0WyI6qwWqC4HEU,6806
 clang_tool_chain/checksums.py,sha256=KFXeAeDz5ZlcZVOxsHDpNDCrm9UDoJ8bMA4PeNhuzdA,9868
@@ -9,7 +9,7 @@ clang_tool_chain/cli_parsers.py,sha256=cHVDyW75N_Kao1VYeAgw_L-1K65DjyvWUigQScTFi
 clang_tool_chain/component_db.py,sha256=ohtlycsrEokui83iZyPsTyxmvXgkD7_OpVwAn1Cq8gI,9096
 clang_tool_chain/downloader.py,sha256=fqErxTaI3oEYbloLZnrWXJ26j2iGOngPnl4i8kqOWNs,6041
 clang_tool_chain/env_breadcrumbs.py,sha256=bvPTz8xABILhzrXTEBzdGrSbpEXLf2YVgcYEe-IdhNY,2335
-clang_tool_chain/env_utils.py,sha256=DVyvoD2xqJwA2LYt7MqnvFSBJiTLOaicCDribFoHTg0,4380
+clang_tool_chain/env_utils.py,sha256=XFcjc_tJWiHLb_o90D0G3t_mT42X2kVLP6rwaIxfOO0,6679
 clang_tool_chain/fetch.py,sha256=DwsNl5DZkNqEYXL-FbCTnp6IA2iCAa9pMl5oPjyuOS4,4696
 clang_tool_chain/installer.py,sha256=GuGeUvVcAw4HMj9jrub-I11ixmksw-vgtSOFrlupmPA,3323
 clang_tool_chain/interrupt_utils.py,sha256=7YvazvGzyItRVDZ_pzUSK6at8PCw-Dgih69HLSz0tT4,1153
@@ -39,7 +39,7 @@ clang_tool_chain/deployment/so_deployer.py,sha256=eAygmGojioi1iz5cHeqmKjJ5fI-5Xo
 clang_tool_chain/directives/__init__.py,sha256=MJDNYL_MD2MF0HFsrTsSTX645bYo6vtjq2pOTtfykaU,198
 clang_tool_chain/directives/parser.py,sha256=6J7mO1JtvuHkkKS0Xges5b_jT9b3uTF6ULI0ZiwGAdw,11179
 clang_tool_chain/execution/__init__.py,sha256=fFQEW9VejCdbBvt4quNJ2X8udh_PKgewTfzUXHmXzyc,940
-clang_tool_chain/execution/arg_transformers.py,sha256=NOuU3WheufJA2MVS79kWtStiL_db-LmdHXPm7GFKEqA,25773
+clang_tool_chain/execution/arg_transformers.py,sha256=Vut8XHp4IHkEUhVRI-NSvFaX6EvrGDd3FCEHbDe9gHo,26268
 clang_tool_chain/execution/build.py,sha256=YHS1BJTZg5pBS9czVko41mBdfswSPad5hxfitMoLvsI,13275
 clang_tool_chain/execution/build_pipeline.py,sha256=ORJEJ8WYp8c7bhWAa-e3w_ySXwenpUczlmXgoGByToY,17823
 clang_tool_chain/execution/core.py,sha256=7CJ0azznC5lq5bw8amk2kwCIN2I_OnDiKytpapkvrdY,25273
@@ -49,7 +49,7 @@ clang_tool_chain/execution/iwyu.py,sha256=bmP0d_PZObA1JfmFYp3qIOKCb7y32AWPm2_ReF
 clang_tool_chain/execution/lldb.py,sha256=VpxkWTPS6PsyskaKTALeziR5Z5NLwarW174Fm1SMX9k,20718
 clang_tool_chain/execution/nodejs_resolver.py,sha256=8QsJWvIfmt5mBDV7n0ypSjsPyXS-eZTizhBli937I-g,11172
 clang_tool_chain/execution/platform_executor.py,sha256=sF4GyW0ujy2EewG8y2Eo1gUWGzss5G5iIkv02w7-2_o,14362
-clang_tool_chain/execution/sanitizer_env.py,sha256=-Gg852-n3YzPhq0D70YCds4BCCqoCjilWnAYRZzrx9k,10084
+clang_tool_chain/execution/sanitizer_env.py,sha256=bLGUATKNnuB8WxWt1eopVgEh6bsZzkmpcpGxYOeRcHk,10642
 clang_tool_chain/installers/__init__.py,sha256=NAV5woPCEDKSbFr1UmfQsrg4Ua5UdghN4q7H3ymvRsg,279
 clang_tool_chain/installers/base.py,sha256=OS78bau9zoYPitmhla7pKsfCPEj-zLY0DkvVzjE31Tw,15437
 clang_tool_chain/installers/clang.py,sha256=rUtheVRF7mq_1YdmQ3XzIybrJqsHbm2Xf0cbhRbH7RQ,16994
@@ -59,7 +59,7 @@ clang_tool_chain/installers/iwyu.py,sha256=9aAhdGtOTY6BrLuPtladY8Y2mz1i7FjgbMxZf
 clang_tool_chain/installers/lldb.py,sha256=FpG8NMNQk8PoNfg6aeU_plmSQrVET7zo-pTvoK8z838,2261
 clang_tool_chain/installers/nodejs.py,sha256=5N07rotgmCfUaDm1uJfBlIAFKC1iTpgZT0HBRuoYwKI,9343
 clang_tool_chain/linker/__init__.py,sha256=ghzDFpZ2-gPmdDO6K05C7yNbY6pZLANPuUks9TaQwVY,537
-clang_tool_chain/linker/lld.py,sha256=OQLmCLNbj2BU0l5HxtHegHvXvblPITg8Gkm_EvJorKw,15381
+clang_tool_chain/linker/lld.py,sha256=PaJ2tuo95t79BCaAIu3E_NPSrv1F24-4N0MJKwfrybo,15577
 clang_tool_chain/platform/__init__.py,sha256=WkV9Y25ua0mtzEGcsIxF-qExtroSTAMKkcElWuQF2BE,342
 clang_tool_chain/platform/detection.py,sha256=PLHyUfmQ5xuohhpz0KSXJWK3d0u0fCsjx1DbM8f1CxQ,5470
 clang_tool_chain/platform/paths.py,sha256=K0IjeVwbmgPlAWQO8mS3r1WS4C2dN6IYrSqPpckeT5c,6088
@@ -71,8 +71,8 @@ clang_tool_chain/symbolizer/unwind_windows.h,sha256=XTWhJDv13AAMUPAzWCfRN7tO6EbN
 clang_tool_chain/testing/__init__.py,sha256=-sYqOOCuTV_u-MkmExrD4uKdTHG4RmMwR3D1kIG281Q,208
 clang_tool_chain/testing/diagnostic_runner.py,sha256=mnmFUEOQulY3-Ggu6hKVGZwjrKQNmV6kY80PRTUu2qU,5293
 clang_tool_chain/testing/diagnostic_tests.py,sha256=GmtKWrDcddZTpx9_yIKfhRAy6YOde8dj7SksCWVEME4,6019
-clang_tool_chain-1.1.2.dist-info/METADATA,sha256=XvG34S1grw40mal9rG5dGnwlfnrALxatwQMzFwQkIio,60267
-clang_tool_chain-1.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-clang_tool_chain-1.1.2.dist-info/entry_points.txt,sha256=N0a0OVPkCFbf6BisRkHj-m2TcZ-f1mqxfXxAHQxfrQg,2800
-clang_tool_chain-1.1.2.dist-info/licenses/LICENSE,sha256=51FO1oc2pZbQNI0v0_THnznnZIF4iFgawG1xnQ58kKo,10997
-clang_tool_chain-1.1.2.dist-info/RECORD,,
+clang_tool_chain-1.1.4.dist-info/METADATA,sha256=EQviHfowQcUB26PHuj-VYtH5YfTNoE1b2D8DOXArOT8,60267
+clang_tool_chain-1.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+clang_tool_chain-1.1.4.dist-info/entry_points.txt,sha256=N0a0OVPkCFbf6BisRkHj-m2TcZ-f1mqxfXxAHQxfrQg,2800
+clang_tool_chain-1.1.4.dist-info/licenses/LICENSE,sha256=51FO1oc2pZbQNI0v0_THnznnZIF4iFgawG1xnQ58kKo,10997
+clang_tool_chain-1.1.4.dist-info/RECORD,,