Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-13 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv: properly resolve type inputs in assembly

Browse Source 
For now the frontend still allows type inputs in assembly. We
might as well resolve them properly in the SPIR-V backend.
This commit is contained in:
Robin Voetter 2024-11-02 12:34:02 +01:00
parent 08ad7afc1e
commit 4fbc100959
No known key found for this signature in database
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/codegen/spirv.zig
View File

@ -1662,7 +1662,7 @@ const NavGen = struct {
else => unreachable,
}
// Guaranteed by callConvSupportsVarArgs, there are nog SPIR-V CCs which support
// Guaranteed by callConvSupportsVarArgs, there are no SPIR-V CCs which support
// varargs.
assert(!fn_info.is_var_args);
@ -6580,8 +6580,16 @@ const NavGen = struct {
// for the string, we still use the next u32 for the null terminator.
input_extra_i += (constraint.len + name.len + (2 + 3)) / 4;
const value = try self.resolve(input);
try as.value_map.put(as.gpa, name, .{ .value = value });
if (self.typeOf(input).zigTypeTag(zcu) == .type) {
// This assembly input is a type instead of a value.
// That's fine for now, just make sure to resolve it as such.
const val = (try self.air.value(input, self.pt)).?;
const ty_id = try self.resolveType(val.toType(), .direct);
try as.value_map.put(as.gpa, name, .{ .ty = ty_id });
} else {
const val_id = try self.resolve(input);
try as.value_map.put(as.gpa, name, .{ .value = val_id });
}
}
as.assemble() catch |err| switch (err) {