mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 04:48:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv: make Type.Ref stronger

Browse Source 
Making Type.Ref an unbounded enum rather than a simple integer
ensures that we don't accidently confuse this token for another type.
This commit is contained in:
Robin Voetter 2022-11-26 01:05:37 +01:00
parent a60308f87c
commit 5826a8a064
No known key found for this signature in database
GPG Key ID: E755662F227CB468
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/codegen/spirv/Assembler.zig
View File

@ -753,7 +753,7 @@ fn parseContextDependentNumber(self: *Assembler) !void {
const tok = self.currentToken();
const result_type_ref = try self.resolveTypeRef(self.inst.operands.items[0].ref_id);
const result_type = self.spv.type_cache.keys()[result_type_ref];
const result_type = self.spv.type_cache.keys()[@enumToInt(result_type_ref)];
switch (result_type.tag()) {
.int => {
const int = result_type.castTag(.int).?;

6
src/codegen/spirv/Module.zig
View File

@ -216,7 +216,7 @@ pub fn resolveType(self: *Module, ty: Type) !Type.Ref {
result.value_ptr.* = try self.emitType(ty);
}
return result.index;
return @intToEnum(Type.Ref, result.index);
}
pub fn resolveTypeId(self: *Module, ty: Type) !IdRef {
@ -226,12 +226,12 @@ pub fn resolveTypeId(self: *Module, ty: Type) !IdRef {
/// Get the result-id of a particular type, by reference. Asserts type_ref is valid.
pub fn typeResultId(self: Module, type_ref: Type.Ref) IdResultType {
return self.type_cache.values()[type_ref];
return self.type_cache.values()[@enumToInt(type_ref)];
}
/// Get the result-id of a particular type as IdRef, by Type.Ref. Asserts type_ref is valid.
pub fn typeRefId(self: Module, type_ref: Type.Ref) IdRef {
return self.type_cache.values()[type_ref].toRef();
return self.type_cache.values()[@enumToInt(type_ref)].toRef();
}
/// Unconditionally emit a spir-v type into the appropriate section.

2
src/codegen/spirv/type.zig
View File

@ -11,7 +11,7 @@ pub const Type = extern union {
ptr_otherwise: *Payload,
/// A reference to another SPIR-V type.
pub const Ref = usize;
pub const Ref = enum(u32) { _ };
pub fn initTag(comptime small_tag: Tag) Type {
comptime assert(@enumToInt(small_tag) < Tag.no_payload_count);