From 53500a57684665e08a2e18e7a736aacfa6548062 Mon Sep 17 00:00:00 2001
From: kcbanner <kcbanner@gmail.com>
Date: Sat, 11 Nov 2023 16:48:11 -0500
Subject: [PATCH] sema: fixup underflows during struct / ptr array init when
 using -fstrip

---
 src/Sema.zig                                |  4 ++--
 test/standalone.zig                         |  4 ++++
 test/standalone/strip_struct_init/build.zig | 16 ++++++++++++++
 test/standalone/strip_struct_init/main.zig  | 23 +++++++++++++++++++++
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 test/standalone/strip_struct_init/build.zig
 create mode 100644 test/standalone/strip_struct_init/main.zig

diff --git a/src/Sema.zig b/src/Sema.zig
index 7823b3ae0f..fd90c80910 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -4814,7 +4814,7 @@ fn validateStructInit(
 
             // Possible performance enhancement: save the `block_index` between iterations
             // of the for loop.
-            var block_index = block.instructions.items.len - 1;
+            var block_index = block.instructions.items.len -| 1;
             while (block_index > 0) : (block_index -= 1) {
                 const store_inst = block.instructions.items[block_index];
                 if (Air.indexToRef(store_inst) == field_ptr_ref) {
@@ -5070,7 +5070,7 @@ fn zirValidatePtrArrayInit(
 
         // Possible performance enhancement: save the `block_index` between iterations
         // of the for loop.
-        var block_index = block.instructions.items.len - 1;
+        var block_index = block.instructions.items.len -| 1;
         while (block_index > 0) : (block_index -= 1) {
             const store_inst = block.instructions.items[block_index];
             if (Air.indexToRef(store_inst) == elem_ptr_ref) {
diff --git a/test/standalone.zig b/test/standalone.zig
index 368da008d8..fc455a2aa7 100644
--- a/test/standalone.zig
+++ b/test/standalone.zig
@@ -234,6 +234,10 @@ pub const build_cases = [_]BuildCase{
         .build_root = "test/standalone/strip_empty_loop",
         .import = @import("standalone/strip_empty_loop/build.zig"),
     },
+    .{
+        .build_root = "test/standalone/strip_struct_init",
+        .import = @import("standalone/strip_struct_init/build.zig"),
+    },
     .{
         .build_root = "test/standalone/cmakedefine",
         .import = @import("standalone/cmakedefine/build.zig"),
diff --git a/test/standalone/strip_struct_init/build.zig b/test/standalone/strip_struct_init/build.zig
new file mode 100644
index 0000000000..b67da46819
--- /dev/null
+++ b/test/standalone/strip_struct_init/build.zig
@@ -0,0 +1,16 @@
+const std = @import("std");
+
+pub fn build(b: *std.Build) void {
+    const test_step = b.step("test", "Test it");
+    b.default_step = test_step;
+
+    const optimize: std.builtin.OptimizeMode = .Debug;
+
+    const main = b.addTest(.{
+        .root_source_file = .{ .path = "main.zig" },
+        .optimize = optimize,
+    });
+    main.strip = true;
+
+    test_step.dependOn(&b.addRunArtifact(main).step);
+}
diff --git a/test/standalone/strip_struct_init/main.zig b/test/standalone/strip_struct_init/main.zig
new file mode 100644
index 0000000000..4f3d63c960
--- /dev/null
+++ b/test/standalone/strip_struct_init/main.zig
@@ -0,0 +1,23 @@
+fn Func(comptime Type: type) type {
+    return struct { value: Type };
+}
+
+inline fn func(value: anytype) Func(@TypeOf(value)) {
+    return .{ .value = value };
+}
+
+test {
+    _ = func(type);
+}
+
+test {
+    const S = struct { field: u32 };
+    comptime var arr: [1]S = undefined;
+    arr[0] = .{ .field = 0 };
+}
+
+test {
+    const S = struct { u32 };
+    comptime var arr: [1]S = undefined;
+    arr[0] = .{0};
+}