Update LLVM

Author: rjodinchr

CMakeLists.txt

@@ -139,9 +139,9 @@ else()
     endif()
     use_component(${CLSPV_LIBCLC_SOURCE_DIR})
 
-    set(RUNTIMES_clspv--_LLVM_ENABLE_RUNTIMES "libclc" CACHE STRING "")
-    set(RUNTIMES_clspv64--_LLVM_ENABLE_RUNTIMES "libclc" CACHE STRING "")
-    set(LLVM_RUNTIME_TARGETS clspv--;clspv64-- CACHE STRING "")
+    set(RUNTIMES_spirv32-unknown-vulkan_LLVM_ENABLE_RUNTIMES "libclc" CACHE STRING "")
+    set(RUNTIMES_spirv64-unknown-vulkan_LLVM_ENABLE_RUNTIMES "libclc" CACHE STRING "")
+    set(LLVM_RUNTIME_TARGETS spirv32-unknown-vulkan;spirv64-unknown-vulkan CACHE STRING "")
 
     # Tell LLVM to build the native target (needed to build libclc).
     set(CLSPV_LLVM_TARGETS_TO_BUILD "Native")

cmake/CMakeLists.txt

@@ -116,13 +116,13 @@ add_custom_target(clspv64_builtin_library
   DEPENDS ${CLSPV64_LIBRARY_OUTPUT_FILE})
 
 if (NOT DEFINED CLSPV_EXTERNAL_LIBCLC_DIR)
-  set(CLSPV_LIBRARY_INPUT_FILE ${CLSPV_LLVM_BINARY_DIR}/lib/clang/${CLANG_EXECUTABLE_VERSION}/lib/spir--/libclc.bc)
-  set(CLSPV64_LIBRARY_INPUT_FILE ${CLSPV_LLVM_BINARY_DIR}/lib/clang/${CLANG_EXECUTABLE_VERSION}/lib/spir64--/libclc.bc)
+  set(CLSPV_LIBRARY_INPUT_FILE ${CLSPV_LLVM_BINARY_DIR}/lib/clang/${CLANG_EXECUTABLE_VERSION}/lib/spirv32-unknown-vulkan/libclc.bc)
+  set(CLSPV64_LIBRARY_INPUT_FILE ${CLSPV_LLVM_BINARY_DIR}/lib/clang/${CLANG_EXECUTABLE_VERSION}/lib/spirv64-unknown-vulkan/libclc.bc)
   set(CLSPV_LIBRARY_DEP libclc)
   set(CLSPV64_LIBRARY_DEP libclc)
 else()
-  set(CLSPV_LIBRARY_INPUT_FILE ${CLSPV_EXTERNAL_LIBCLC_DIR}/spir--/libclc.bc)
-  set(CLSPV64_LIBRARY_INPUT_FILE ${CLSPV_EXTERNAL_LIBCLC_DIR}/spir64--/libclc.bc)
+  set(CLSPV_LIBRARY_INPUT_FILE ${CLSPV_EXTERNAL_LIBCLC_DIR}/spirv32-unknown-vulkan/libclc.bc)
+  set(CLSPV64_LIBRARY_INPUT_FILE ${CLSPV_EXTERNAL_LIBCLC_DIR}/spirv64-unknown-vulkan/libclc.bc)
   set(CLSPV_LIBRARY_DEP ${CLSPV_LIBRARY_INPUT_FILE})
   set(CLSPV64_LIBRARY_DEP ${CLSPV64_LIBRARY_INPUT_FILE})
 endif()

deps.json

@@ -6,7 +6,10 @@
       "subrepo" : "llvm/llvm-project",
       "branch" : "main",
       "subdir" : "third_party/llvm",
-      "commit" : "6a9dac29a1aa4f3702c93a2a6d7172219438c59f"
+      "commit" : "944cc03a4d68fe0f0002040b5e85400a068a0e74",
+      "patches" : [
+          {"patch": "patches/0001-SSAF-Fix-MSVC-template-parsing-error-in-Serializatio.patch"},
+      ]
     },
     {
       "name" : "SPIRV-Headers",

patches/0001-SSAF-Fix-MSVC-template-parsing-error-in-Serializatio.patch

@@ -0,0 +1,72 @@
+From 7e40076d7cff79d8412d5b1f40c36b9f4aaa1f76 Mon Sep 17 00:00:00 2001
+From: Romaric Jodin <rjodin@google.com>
+Date: Fri, 8 May 2026 16:14:06 +0200
+Subject: [PATCH] [SSAF] Fix MSVC template parsing error in SerializationFormat
+
+This commit fixes a hard compilation error on Windows when building
+translation units that instantiate the `Add` registry template
+(such as `PointerFlowAnalysis.cpp`).
+
+**Root Cause:**
+When compiling on Windows, Clang defaults to MSVC compatibility mode
+(`-fms-compatibility`). Under this mode, Clang's two-phase template
+lookup struggles to resolve function-local static variables
+(`SavedSerialize` and `SavedDeserialize`) captured by a local class
+(`ConcreteCodec`) inside an uninstantiated template. During Phase 1
+parsing, Clang incorrectly falls back to assuming these variables must
+be members of a dependent base class, rewriting them to
+`this->SavedSerialize`. During Phase 2 instantiation, compilation
+fails because the base class (`Codec`) has no such members.
+
+**The Fix:**
+Hoisted `SavedSerialize` and `SavedDeserialize` out of the constructor
+scope, making them `static inline` members of the `Add` class template.
+This allows Clang's Phase 1 parser to perfectly resolve the symbols
+without relying on broken MSVC fallbacks.
+
+**Why this is safe (Addressing the `dlopen` comment):**
+The original author explicitly commented that they avoided `static inline`
+class members to prevent Linux symbol visibility issues across shared
+library boundaries (`dlopen` with `RTLD_LOCAL`).
+
+That concern is still honored by this fix. The visibility risk only applies
+if the `ConcreteCodec`'s *own* execution state relied directly on static
+members. By moving the static variables to the `Add` factory class,
+`ConcreteCodec` continues to store `SerFn` and `DesFn` as strictly
+**instance members**. The `ConcreteCodec` constructor safely snapshots
+the plugin's local copy of `Add::SavedSerialize` at the moment of
+instantiation. Since the virtual methods executed by the host still
+read exclusively from the isolated instance state, the runtime behavior
+remains completely identical and safe.
+---
+ .../Core/Serialization/SerializationFormat.h               | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h
+index fd261c6d9a72..9ab79dda3fc1 100644
+--- a/clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h
++++ b/clang/include/clang/ScalableStaticAnalysisFramework/Core/Serialization/SerializationFormat.h
+@@ -133,6 +133,9 @@ protected:
+       using TypedSerializerFn =
+           llvm::function_ref<SerRet(const AnalysisResultT &, SerArgs...)>;
+ 
++      static inline TypedSerializerFn SavedSerialize;
++      static inline DeserializerFn SavedDeserialize;
++
+       /// Takes the plugin's typed serializer and the deserializer, and
+       /// inserts them into \c llvm::Registry<Codec>.
+       Add(TypedSerializerFn TypedSerialize, DeserializerFn Deserialize) {
+@@ -154,8 +157,8 @@ protected:
+         /// visibility issues across shared library boundaries on Linux
+         /// (where \c dlopen with \c RTLD_LOCAL can give the host and
+         /// plugin separate copies of \c static \c inline members).
+-        static TypedSerializerFn SavedSerialize = TypedSerialize;
+-        static DeserializerFn SavedDeserialize = Deserialize;
++        SavedSerialize = TypedSerialize;
++        SavedDeserialize = Deserialize;
+ 
+         /// Concrete subclass of \c Codec for \c AnalysisResultT.
+         /// The \c serialize() override performs the downcast from
+-- 
+2.54.0.563.g4f69b47b94-goog
+

test/MathBuiltins/cospi/cospi_double2.ll

@@ -12,6 +12,6 @@ entry:
 
 declare spir_func <2 x double> @_Z5cospiDv2_d(<2 x double>)
 
-; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul <2 x double> %x, splat (double  0x400921FB54442D18)
+; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul <2 x double> %x, splat (double  f0x400921FB54442D18)
 ; CHECK: [[cos:%[a-zA-Z0-9_.]+]] = call <2 x double> @llvm.cos.v2f64(<2 x double> [[mul]])
 

test/MathBuiltins/cospi/cospi_float.ll

@@ -12,5 +12,5 @@ entry:
 
 declare spir_func float @_Z5cospif(float)
 
-; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul float %x, 0x400921FB60000000
+; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul float %x, f0x40490FDB
 ; CHECK: [[cos:%[a-zA-Z0-9_.]+]] = call float @llvm.cos.f32(float [[mul]])

test/MathBuiltins/cospi/cospi_float2.ll

@@ -12,5 +12,5 @@ entry:
 
 declare spir_func <2 x float> @_Z5cospiDv2_f(<2 x float>)
 
-; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul <2 x float> %x, splat (float 0x400921FB60000000)
+; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul <2 x float> %x, splat (float f0x40490FDB)
 ; CHECK: [[cos:%[a-zA-Z0-9_.]+]] = call <2 x float> @llvm.cos.v2f32(<2 x float> [[mul]])

test/MathBuiltins/cospi/cospi_half.ll

@@ -12,6 +12,6 @@ entry:
 
 declare spir_func half @_Z5cospiDh(half)
 
-; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul half %x, 0xH4248
+; CHECK: [[mul:%[a-zA-Z0-9_.]+]] = fmul half %x, 3.140630e+00
 ; CHECK: [[cos:%[a-zA-Z0-9_.]+]] = call half @llvm.cos.f16(half [[mul]])
 

test/MathBuiltins/expm1/expm1_half.ll

@@ -13,6 +13,6 @@ entry:
 declare spir_func half @_Z5expm1Dh(half %x)
 
 ; CHECK: [[exp:%[a-zA-Z0-9_.]+]] = call half @llvm.exp.f16(half %x)
-; CHECK: [[sub:%[a-zA-Z0-9_.]+]] = fsub half [[exp]], 0xH3C00
+; CHECK: [[sub:%[a-zA-Z0-9_.]+]] = fsub half [[exp]], 1.000000e+00
 ; CHECK: ret half [[sub]]
 

test/MathBuiltins/fdim/fdim_half.ll

@@ -14,6 +14,6 @@ declare spir_func half @_Z4fdimDhDh(half, half)
 
 ; CHECK: [[sub:%[a-zA-Z0-9_.]+]] = fsub half %x, %y
 ; CHECK: [[gt:%[a-zA-Z0-9_.]+]] = fcmp ugt half %x, %y
-; CHECK: [[sel:%[a-zA-Z0-9_.]+]] = select i1 [[gt]], half [[sub]], half 0xH0000
+; CHECK: [[sel:%[a-zA-Z0-9_.]+]] = select i1 [[gt]], half [[sub]], half 0.000000e+00
 ; CHECK: ret half [[sel]]