spirv: fix null file handle crash & improve flush err handling #24296
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add makeWritable() call before writeAll() in SPIR-V linker flush function. SPIR-V linker was trying to write to uninitialized file handle. - Add .spirv case to makeWritable() switch in link.zig - Call makeWritable() with proper error handling in SpirV.zig - OutOfMemory propagates up, other errors become LinkFailure Fixes ziglang#23883
|
cc @alichraghi |
alichraghi
suggested changes
Jun 30, 2025
added 2 commits
July 1, 2025 23:36
Add makeWritable() call before file operations to ensure file handle is initialized. Implement ELF/COFF delegation pattern with flushInner() for consistent error handling and architectural parity with other major linkers. Prevents crash when SPIR-V linker attempts to write to uninitialized file.
|
@alichraghi if you got time, mind looking at this? |
nuIIpointerexception
changed the title
alichraghi
suggested changes
Jul 2, 2025
Comment on lines
+192
to
+196
| return flushInner(self, arena, tid, sub_prog_node) catch |err| switch (err) { | ||
| error.OutOfMemory => return error.OutOfMemory, | ||
| error.LinkFailure => return error.LinkFailure, | ||
| else => |e| return diags.fail("SPIR-V flush failed: {s}", .{@errorName(e)}), | ||
| }; |
There was a problem hiding this comment.
just return LinkFailure for every other error:
return flushInner(self, arena, tid, sub_prog_node) catch |err| switch (err) {
error.OutOfMemory => return error.OutOfMemory,
- error.LinkFailure => return error.LinkFailure,
- else => |e| return diags.fail("SPIR-V flush failed: {s}", .{@errorName(e)}),
+ else => return error.LinkFailure,
};
Comment on lines
+260
to
+261
| try self.pwriteAll(std.mem.sliceAsBytes(linked_module), 0); | ||
| try self.setEndPos(linked_module.len * @sizeOf(Word)); |
There was a problem hiding this comment.
Don't abstract them into mini functions. just use try:
- try self.pwriteAll(std.mem.sliceAsBytes(linked_module), 0);
- try self.setEndPos(linked_module.len * @sizeOf(Word));
+ try self.base.file.?.pwriteAll(std.mem.sliceAsBytes(linked_module), 0);
+ try self.base.file.?.setEndPos(linked_module.len * @sizeOf(Word));
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add makeWritable() call before writeAll() in SPIR-V linker flush function.
SPIR-V linker was trying to write to uninitialized file handle.
Changes:
Testing:
zig build-obj shader.zig -target spirv64-vulkanFixes #23883