1 files changed, 6 insertions, 5 deletions
diff --git a/src/codegen/spirv/Module.zig b/src/codegen/spirv/Module.zig
index 8daac06222..856b1eaf67 100644
--- a/src/codegen/spirv/Module.zig
+++ b/src/codegen/spirv/Module.zig
@@ -676,8 +676,9 @@ pub fn structType(
     ip_index: InternPool.Index,
 ) !Id {
     const target = module.zcu.getTarget();
+    const actual_ip_index = if (module.zcu.comp.config.root_strip) .none else ip_index;
 
-    if (module.cache.struct_types.get(.{ .fields = types, .ip_index = ip_index })) |id| return id;
+    if (module.cache.struct_types.get(.{ .fields = types, .ip_index = actual_ip_index })) |id| return id;
     const result_id = module.allocId();
     const types_dup = try module.arena.dupe(Id, types);
     try module.sections.globals.emit(module.gpa, .OpTypeStruct, .{
@@ -710,10 +711,7 @@ pub fn structType(
 
     try module.cache.struct_types.put(
         module.gpa,
-        .{
-            .fields = types_dup,
-            .ip_index = if (module.zcu.comp.config.root_strip) .none else ip_index,
-        },
+        .{ .fields = types_dup, .ip_index = actual_ip_index },
         result_id,
     );
     return result_id;
@@ -874,6 +872,7 @@ pub fn declareEntryPoint(
 }
 
 pub fn debugName(module: *Module, target: Id, name: []const u8) !void {
+    if (module.zcu.comp.config.root_strip) return;
     try module.sections.debug_names.emit(module.gpa, .OpName, .{
         .target = target,
         .name = name,
@@ -881,12 +880,14 @@ pub fn debugName(module: *Module, target: Id, name: []const u8) !void {
 }
 
 pub fn debugNameFmt(module: *Module, target: Id, comptime fmt: []const u8, args: anytype) !void {
+    if (module.zcu.comp.config.root_strip) return;
     const name = try std.fmt.allocPrint(module.gpa, fmt, args);
     defer module.gpa.free(name);
     try module.debugName(target, name);
 }
 
 pub fn memberDebugName(module: *Module, target: Id, member: u32, name: []const u8) !void {
+    if (module.zcu.comp.config.root_strip) return;
     try module.sections.debug_names.emit(module.gpa, .OpMemberName, .{
         .type = target,
         .member = member,