update zig sources to 0.15.0-dev.233+7c85dc460

Author: andrewrk

README.md

@@ -11,7 +11,7 @@ to find and inspect the patch diffs.
  * LLVM, LLD, Clang 20.1.2
  * zlib 1.3.1
  * zstd 1.5.2
- * zig 0.15.0-dev.203+53270f008
+ * zig 0.15.0-dev.233+7c85dc460
 
 For other versions, check the git tags of this repository.
 

build

@@ -7,7 +7,7 @@ TARGET="$1" # Example: riscv64-linux-gnu
 MCPU="$2" # Examples: `baseline`, `native`, `generic+v7a`, or `arm1176jzf_s`
 
 ROOTDIR="$(pwd)"
-ZIG_VERSION="0.15.0-dev.203+53270f008"
+ZIG_VERSION="0.15.0-dev.233+7c85dc460"
 
 TARGET_OS_AND_ABI=${TARGET#*-} # Example: linux-gnu
 

build.bat

@@ -35,7 +35,7 @@ if "%VSCMD_ARG_HOST_ARCH%"=="x86" set OUTDIR=out-win-x86
 
 set ROOTDIR=%~dp0
 set "ROOTDIR_CMAKE=%ROOTDIR:\=/%"
-set ZIG_VERSION="0.15.0-dev.203+53270f008"
+set ZIG_VERSION="0.15.0-dev.233+7c85dc460"
 set JOBS_ARG=
 
 pushd %ROOTDIR%

zig/CMakeLists.txt

@@ -809,7 +809,7 @@ if(MSVC)
 else()
   set(ZIG_WASM2C_COMPILE_FLAGS "-std=c99 -O2")
   set(ZIG1_COMPILE_FLAGS "-std=c99 -Os")
-  set(ZIG2_COMPILE_FLAGS "-std=c99 -O0 -fno-stack-protector")
+  set(ZIG2_COMPILE_FLAGS "-std=c99 -O0 -fno-sanitize=undefined -fno-stack-protector")
   if(APPLE)
     set(ZIG2_LINK_FLAGS "-Wl,-stack_size,0x10000000")
   elseif(MINGW)

zig/bootstrap.c

@@ -123,7 +123,7 @@ int main(int argc, char **argv) {
         if (f == NULL)
             panic("unable to open config.zig for writing");
 
-        const char *zig_version = "0.15.0-dev.203+53270f008";
+        const char *zig_version = "0.15.0-dev.233+7c85dc460";
 
         int written = fprintf(f,
             "pub const have_llvm = false;\n"

zig/build.zig

@@ -1196,6 +1196,10 @@ const llvm_libs = [_][]const u8{
     "LLVMSystemZCodeGen",
     "LLVMSystemZDesc",
     "LLVMSystemZInfo",
+    "LLVMSPIRVCodeGen",
+    "LLVMSPIRVDesc",
+    "LLVMSPIRVInfo",
+    "LLVMSPIRVAnalysis",
     "LLVMSparcDisassembler",
     "LLVMSparcAsmParser",
     "LLVMSparcCodeGen",

zig/cmake/Findlld.cmake

@@ -12,8 +12,8 @@ find_path(LLD_INCLUDE_DIRS NAMES lld/Common/Driver.h
         /usr/lib/llvm-20/include
         /usr/local/llvm200/include
         /usr/local/llvm20/include
-        /usr/local/opt/llvm@20/include
-        /opt/homebrew/opt/llvm@20/include
+        /usr/local/opt/lld@20/include
+        /opt/homebrew/opt/lld@20/include
         /mingw64/include)
 
 find_library(LLD_LIBRARY NAMES lld-20.0 lld200 lld NAMES_PER_DIR
@@ -22,8 +22,8 @@ find_library(LLD_LIBRARY NAMES lld-20.0 lld200 lld NAMES_PER_DIR
         /usr/lib/llvm-20/lib
         /usr/local/llvm200/lib
         /usr/local/llvm20/lib
-        /usr/local/opt/llvm@20/lib
-        /opt/homebrew/opt/llvm@20/lib
+        /usr/local/opt/lld@20/lib
+        /opt/homebrew/opt/lld@20/lib
 )
 if(EXISTS ${LLD_LIBRARY})
     set(LLD_LIBRARIES ${LLD_LIBRARY})
@@ -37,8 +37,8 @@ else()
                 /usr/lib/llvm-20/lib
                 /usr/local/llvm200/lib
                 /usr/local/llvm20/lib
-                /usr/local/opt/llvm@20/lib
-                /opt/homebrew/opt/llvm@20/lib
+                /usr/local/opt/lld@20/lib
+                /opt/homebrew/opt/lld@20/lib
                 /mingw64/lib
                 /c/msys64/mingw64/lib
                 c:/msys64/mingw64/lib)

zig/cmake/Findllvm.cmake

@@ -227,6 +227,10 @@ else()
   FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen)
   FIND_AND_ADD_LLVM_LIB(LLVMSystemZDesc)
   FIND_AND_ADD_LLVM_LIB(LLVMSystemZInfo)
+  FIND_AND_ADD_LLVM_LIB(LLVMSPIRVCodeGen)
+  FIND_AND_ADD_LLVM_LIB(LLVMSPIRVDesc)
+  FIND_AND_ADD_LLVM_LIB(LLVMSPIRVInfo)
+  FIND_AND_ADD_LLVM_LIB(LLVMSPIRVAnalysis)
   FIND_AND_ADD_LLVM_LIB(LLVMSparcDisassembler)
   FIND_AND_ADD_LLVM_LIB(LLVMSparcAsmParser)
   FIND_AND_ADD_LLVM_LIB(LLVMSparcCodeGen)

zig/lib/compiler/aro_translate_c.zig

@@ -1502,19 +1502,29 @@ pub fn ScopeExtra(comptime ScopeExtraContext: type, comptime ScopeExtraType: typ
                 return scope.base.parent.?.getAlias(name);
             }
 
-            /// Finds the (potentially) mangled struct name for a locally scoped extern variable given the original declaration name.
+            /// Finds the (potentially) mangled struct name for a locally scoped extern variable or function given the original declaration name.
             ///
             /// Block scoped extern declarations translate to:
             ///     const MangledStructName = struct {extern [qualifiers] original_extern_variable_name: [type]};
             /// This finds MangledStructName given original_extern_variable_name for referencing correctly in transDeclRefExpr()
             pub fn getLocalExternAlias(scope: *Block, name: []const u8) ?[]const u8 {
                 for (scope.statements.items) |node| {
-                    if (node.tag() == .extern_local_var) {
-                        const parent_node = node.castTag(.extern_local_var).?;
-                        const init_node = parent_node.data.init.castTag(.var_decl).?;
-                        if (std.mem.eql(u8, init_node.data.name, name)) {
-                            return parent_node.data.name;
-                        }
+                    switch (node.tag()) {
+                        .extern_local_var => {
+                            const parent_node = node.castTag(.extern_local_var).?;
+                            const init_node = parent_node.data.init.castTag(.var_decl).?;
+                            if (std.mem.eql(u8, init_node.data.name, name)) {
+                                return parent_node.data.name;
+                            }
+                        },
+                        .extern_local_fn => {
+                            const parent_node = node.castTag(.extern_local_fn).?;
+                            const init_node = parent_node.data.init.castTag(.func).?;
+                            if (std.mem.eql(u8, init_node.data.name.?, name)) {
+                                return parent_node.data.name;
+                            }
+                        },
+                        else => {},
                     }
                 }
                 return null;

zig/lib/compiler/aro_translate_c/ast.zig

@@ -57,6 +57,8 @@ pub const Node = extern union {
         static_local_var,
         /// const ExternLocal_name = struct { init }
         extern_local_var,
+        /// const ExternLocal_name = struct { init }
+        extern_local_fn,
         /// var name = init.*
         mut_str,
         func,
@@ -367,7 +369,13 @@ pub const Node = extern union {
                 .c_pointer, .single_pointer => Payload.Pointer,
                 .array_type, .null_sentinel_array_type => Payload.Array,
                 .arg_redecl, .alias, .fail_decl => Payload.ArgRedecl,
-                .var_simple, .pub_var_simple, .static_local_var, .extern_local_var, .mut_str => Payload.SimpleVarDecl,
+                .var_simple,
+                .pub_var_simple,
+                .static_local_var,
+                .extern_local_var,
+                .extern_local_fn,
+                .mut_str,
+                => Payload.SimpleVarDecl,
                 .enum_constant => Payload.EnumConstant,
                 .array_filler => Payload.ArrayFiller,
                 .pub_inline_fn => Payload.PubInlineFn,
@@ -1265,8 +1273,11 @@ fn renderNode(c: *Context, node: Node) Allocator.Error!NodeIndex {
                 } },
             });
         },
-        .extern_local_var => {
-            const payload = node.castTag(.extern_local_var).?.data;
+        .extern_local_var, .extern_local_fn => {
+            const payload = if (node.tag() == .extern_local_var)
+                node.castTag(.extern_local_var).?.data
+            else
+                node.castTag(.extern_local_fn).?.data;
 
             const const_tok = try c.addToken(.keyword_const, "const");
             _ = try c.addIdentifier(payload.name);
@@ -2293,7 +2304,7 @@ fn renderNullSentinelArrayType(c: *Context, len: usize, elem_type: Node) !NodeIn
 fn addSemicolonIfNeeded(c: *Context, node: Node) !void {
     switch (node.tag()) {
         .warning => unreachable,
-        .var_decl, .var_simple, .arg_redecl, .alias, .block, .empty_block, .block_single, .@"switch", .static_local_var, .extern_local_var, .mut_str => {},
+        .var_decl, .var_simple, .arg_redecl, .alias, .block, .empty_block, .block_single, .@"switch", .static_local_var, .extern_local_var, .extern_local_fn, .mut_str => {},
         .while_true => {
             const payload = node.castTag(.while_true).?.data;
             return addSemicolonIfNotBlock(c, payload);
@@ -2390,6 +2401,7 @@ fn renderNodeGrouped(c: *Context, node: Node) !NodeIndex {
         .builtin_extern,
         .static_local_var,
         .extern_local_var,
+        .extern_local_fn,
         .mut_str,
         .macro_arithmetic,
         => {