Merge branch 'feature/checkcrt' of https://github.com/quesswho/slang into feature/checkcrt

Author: quesswho

.github/workflows/ci-slang-build-container.yml

@@ -20,7 +20,7 @@ jobs:
       contents: read
       packages: read # Required to pull container from ghcr.io
     container:
-      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0
+      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0
       options: --user root -v /:/host_root
 
     env:

.github/workflows/ci-slang-test-container.yml

@@ -27,7 +27,7 @@ jobs:
       packages: read
 
     container:
-      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0
+      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -142,7 +142,7 @@ jobs:
       packages: read
 
     container:
-      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0
+      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
@@ -225,7 +225,7 @@ jobs:
       packages: read
 
     container:
-      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0
+      image: ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0
       credentials:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}

cmake/CheckSecureCRT.cmake

@@ -46,3 +46,4 @@ slang_probe_symbol_call(HAVE_WCSNCPY_S
 slang_probe_symbol_call(HAVE_STRNCPY_S
     "char b[1]; strncpy_s(b, 1, \"x\", 1)"
     "string.h")
+

cmake/CompilerFlags.cmake

@@ -221,6 +221,7 @@ function(set_default_compile_options target)
                     -fsanitize=address
                     -fsanitize=undefined
                     -fno-sanitize-recover=undefined
+                    -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/cmake/sanitizer-ignorelist.txt
             )
             target_link_options(
                 ${target}

cmake/SlangTarget.cmake

@@ -563,7 +563,6 @@ function(slang_add_target dir type)
         )
     endif()
 
-
     #
     # Precompiled headers (PCH)
     #

cmake/sanitizer-ignorelist.txt

@@ -0,0 +1,13 @@
+# UBSan ignorelist for prebuilt slang-llvm shared library.
+#
+# The prebuilt libslang-llvm is not compiled with sanitizers, so UBSan's
+# vptr checker cannot validate vtables from objects created inside it.
+# This causes false-positive "invalid vptr" aborts when sanitized code
+# calls virtual methods on ILLVMBuilder (a COM interface returned by the
+# non-instrumented library).
+#
+# Skip vptr checks for COM interfaces whose implementation lives in slang-llvm.
+# The type: pattern suppresses checks at all call sites regardless of which
+# source file the virtual call is in (e.g. slang-emit-llvm.cpp, slang-emit.cpp).
+[vptr]
+type:*ILLVMBuilder*

docker/linux-gpu-ci.Dockerfile

@@ -6,11 +6,10 @@
 # Used by:
 # - .github/workflows/ci-slang-build-container.yml
 # - .github/workflows/ci-slang-test-container.yml
-# - .github/workflows/copilot-setup-steps.yml
 #
 # Build and push:
-#   docker build -f docker/linux-gpu-ci.Dockerfile -t ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0 .
-#   docker push ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0
+#   docker build -f docker/linux-gpu-ci.Dockerfile -t ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0 .
+#   docker push ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0
 #
 # IMPORTANT: After pushing a new version, update all references in:
 #   - .github/workflows/ci-slang-build-container.yml
@@ -24,8 +23,8 @@
 
 FROM nvidia/cuda:13.0.1-devel-ubuntu22.04
 
-# Install essential tools required for GitHub Actions and Copilot
-# - curl: for downloading Copilot runtime and dependencies
+# Install essential tools required for GitHub Actions
+# - curl: for downloading dependencies
 # - wget: for downloading CMake and other tools
 # - git: for repository operations and submodules
 # - tar, gzip: for archive extraction
@@ -58,18 +57,18 @@ RUN apt-get update && apt-get install -y \
     glslang-tools \
     && rm -rf /var/lib/apt/lists/*
 
-# Install Vulkan SDK 1.4.321.1 from tarball (apt packages discontinued after 1.4.313)
+# Install Vulkan SDK 1.4.341.1 from tarball (apt packages discontinued after 1.4.313)
 # Using tarball to get the fixed validation layers that resolve cooperative vector issues
-ENV VULKAN_SDK=/opt/vulkan-sdk/1.4.321.1/x86_64
+ENV VULKAN_SDK=/opt/vulkan-sdk/1.4.341.1/x86_64
 ENV PATH="${VULKAN_SDK}/bin:${PATH}"
 ENV LD_LIBRARY_PATH="${VULKAN_SDK}/lib:${LD_LIBRARY_PATH}"
 ENV VK_LAYER_PATH="${VULKAN_SDK}/share/vulkan/explicit_layer.d"
 
-RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.321.1/linux/vulkansdk-linux-x86_64-1.4.321.1.tar.xz && \
-    tar -xf vulkansdk-linux-x86_64-1.4.321.1.tar.xz && \
+RUN wget -q https://sdk.lunarg.com/sdk/download/1.4.341.1/linux/vulkansdk-linux-x86_64-1.4.341.1.tar.xz && \
+    tar -xf vulkansdk-linux-x86_64-1.4.341.1.tar.xz && \
     mkdir -p /opt/vulkan-sdk && \
-    mv 1.4.321.1 /opt/vulkan-sdk/ && \
-    rm -rf vulkansdk-linux-x86_64-1.4.321.1.tar.xz
+    mv 1.4.341.1 /opt/vulkan-sdk/ && \
+    rm -rf vulkansdk-linux-x86_64-1.4.341.1.tar.xz
 
 # Install runtime libraries for test execution
 RUN apt-get update && apt-get install -y \

docker/print-env-info.sh

@@ -12,6 +12,6 @@ echo "vulkan_sdk=${VULKAN_SDK:-not_set}"
 echo "vulkan_layer_path=${VK_LAYER_PATH:-not_set}"
 echo "vulkan_validation_api=$(grep -o '"api_version": "[^"]*"' "${VK_LAYER_PATH}/VkLayer_khronos_validation.json" 2>/dev/null | head -1 | cut -d'"' -f4 || echo 'unknown')"
 echo "vulkan_icd_api=$(grep -o '"api_version" : "[^"]*"' /etc/vulkan/icd.d/nvidia_icd.json 2>/dev/null | cut -d'"' -f4 || echo 'unknown')"
-echo "container_image=${CONTAINER_IMAGE:-ghcr.io/shader-slang/slang-linux-gpu-ci:v1.3.0}"
+echo "container_image=${CONTAINER_IMAGE:-ghcr.io/shader-slang/slang-linux-gpu-ci:v1.4.0}"
 echo "runner_name=${RUNNER_NAME:-unknown}"
 echo "ENV_INFO_END"

source/core/slang-secure-crt.h

@@ -281,3 +281,4 @@ inline int strncpy_s(char* strDest, size_t numberOfElements, const char* strSour
 #endif // HAVE_STRNCPY_S
 #endif // SLANG_CORE_SECURE_CRT_H
 #endif // _MSC_VER
+

source/slang/slang-check-decl.cpp

@@ -7812,21 +7812,21 @@ bool SemanticsVisitor::checkConformance(
             auto superTypeDecl = superDeclRefType->getDeclRef().getDecl();
             if (superTypeDecl->findModifier<ComInterfaceAttribute>())
             {
-                // A struct cannot implement a COM Interface.
-                if (auto classDecl = as<ClassDecl>(superTypeDecl))
+                auto subTypeDecl = declRef.getDecl();
+                if (auto classDecl = as<ClassDecl>(subTypeDecl))
                 {
-                    // OK.
+                    // Classes can implement COM interfaces.
                     SLANG_UNUSED(classDecl);
                 }
-                else if (auto subInterfaceDecl = as<InterfaceDecl>(superTypeDecl))
+                else if (auto subInterfaceDecl = as<InterfaceDecl>(subTypeDecl))
                 {
                     if (!subInterfaceDecl->findModifier<ComInterfaceAttribute>())
                     {
                         getSink()->diagnose(
                             Diagnostics::InterfaceInheritingComMustBeCom{.decl = inheritanceDecl});
                     }
                 }
-                else if (const auto structDecl = as<StructDecl>(superTypeDecl))
+                else if (const auto structDecl = as<StructDecl>(subTypeDecl))
                 {
                     getSink()->diagnose(
                         Diagnostics::StructCannotImplementComInterface{.decl = inheritanceDecl});
@@ -8248,6 +8248,15 @@ void SemanticsDeclBasesVisitor::visitInterfaceDecl(InterfaceDecl* decl)
         // a circular inheritance relationship.
 
         _validateCrossModuleInheritance(decl, inheritanceDecl);
+
+        if (baseInterfaceDeclRef.getDecl()->findModifier<ComInterfaceAttribute>())
+        {
+            if (!decl->findModifier<ComInterfaceAttribute>())
+            {
+                getSink()->diagnose(
+                    Diagnostics::InterfaceInheritingComMustBeCom{.decl = inheritanceDecl});
+            }
+        }
     }
 
     if (decl->findModifier<ComInterfaceAttribute>())