From 5220ddde4296e32cbb79f5247fac131fed9a815a Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Thu, 11 Jan 2024 18:59:58 +0100
Subject: [PATCH 1/3] only call `stackFallback(N).get` once

---
 src/translate_c.zig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/translate_c.zig b/src/translate_c.zig
index 744e0f085..f4d658e83 100644
--- a/src/translate_c.zig
+++ b/src/translate_c.zig
@@ -37,10 +37,9 @@ pub fn convertCInclude(allocator: std.mem.Allocator, tree: Ast, node: Ast.Node.I
     var output = std.ArrayListUnmanaged(u8){};
     errdefer output.deinit(allocator);
 
-    var stack_allocator = std.heap.stackFallback(512, allocator);
-
     var buffer: [2]Ast.Node.Index = undefined;
     for (ast.builtinCallParams(tree, node, &buffer).?) |child| {
+        var stack_allocator = std.heap.stackFallback(512, allocator);
         try convertCIncludeInternal(allocator, stack_allocator.get(), tree, child, &output);
     }
 

From 2ef74332dbfea7528c4f74a3477d8873ee8f0367 Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Thu, 11 Jan 2024 19:00:21 +0100
Subject: [PATCH 2/3] update min zig version

---
 build.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.zig b/build.zig
index 9a7b56bbc..96c2f85e6 100644
--- a/build.zig
+++ b/build.zig
@@ -4,8 +4,8 @@ const builtin = @import("builtin");
 const zls_version = std.SemanticVersion{ .major = 0, .minor = 12, .patch = 0 };
 
 /// document the latest breaking change that caused a change to the string below:
-/// build/LazyPath: Add dirname (#18371)
-const min_zig_string = "0.12.0-dev.2046+d3a163f86";
+/// std.heap: add runtime safety for calling `stackFallback(N).get` multiple times
+const min_zig_string = "0.12.0-dev.2138+828d23956";
 
 const Build = blk: {
     const current_zig = builtin.zig_version;

From 33a07c7ae5e57770463c5082db12258ad879412f Mon Sep 17 00:00:00 2001
From: Techatrix <19954306+Techatrix@users.noreply.github.com>
Date: Thu, 11 Jan 2024 19:00:32 +0100
Subject: [PATCH 3/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/63143ac2c9186be6d9da6035fa22620018c85932' (2024-01-02)
  → 'github:NixOS/nixpkgs/eabe8d3eface69f5bb16c18f8662a702f50c20d5' (2024-01-09)
• Updated input 'zig-overlay':
    'github:mitchellh/zig-overlay/e056aafd8db157ff7519518a026c5ba7040522cf' (2024-01-06)
  → 'github:mitchellh/zig-overlay/9ff9a710a664350f5d3a694824fa2b868b5a22af' (2024-01-11)
---
 flake.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index e5712fc8a..2c8f3c22f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -83,11 +83,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1704161960,
-        "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=",
+        "lastModified": 1704842529,
+        "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63143ac2c9186be6d9da6035fa22620018c85932",
+        "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704500574,
-        "narHash": "sha256-Ockm1D5QsxdVZZoD0Yf5Kg4FupbVnk3X0RLkc6geRIE=",
+        "lastModified": 1704932604,
+        "narHash": "sha256-CJmwApSNie7rKNo2T6JscgwoIbTTTSNr4nb6OvZxj7s=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "e056aafd8db157ff7519518a026c5ba7040522cf",
+        "rev": "9ff9a710a664350f5d3a694824fa2b868b5a22af",
         "type": "github"
       },
       "original": {