authorgravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-09-16 00:58:22+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-09-23 12:36:44-07:00
logaeaaa953a04c42fb2068be559155e237f7e931d2
tree6645d5da02da790afa79400f009d16e2eef7fc30
parentece52640ebeac867e0f69116f99bc14f5590bb9a

spirv: assign type names to (error) unions

2 files changed, 14 insertions(+), 5 deletions(-)

src/codegen/spirv.zig+12-3
......@@ -1178,6 +1178,14 @@ pub const DeclGen = struct {
11781178 }
11791179 }
11801180
1181 // Turn a Zig type's name into a cache reference.
1182 fn resolveTypeName(self: *DeclGen, ty: Type) !CacheString {
1183 var name = std.ArrayList(u8).init(self.gpa);
1184 defer name.deinit();
1185 try ty.print(name.writer(), self.module);
1186 return try self.spv.resolveString(name.items);
1187 }
1188
11811189 /// Turn a Zig type into a SPIR-V Type, and return its type result-id.
11821190 fn resolveTypeId(self: *DeclGen, ty: Type) !IdResultType {
11831191 const type_ref = try self.resolveType(ty, .direct);
......@@ -1289,6 +1297,7 @@ pub const DeclGen = struct {
12891297 }
12901298
12911299 const ty_ref = try self.spv.resolve(.{ .struct_type = .{
1300 .name = try self.resolveTypeName(ty),
12921301 .member_types = member_types.slice(),
12931302 .member_names = member_names.slice(),
12941303 } });
......@@ -1443,6 +1452,7 @@ pub const DeclGen = struct {
14431452 }
14441453
14451454 const ty_ref = try self.spv.resolve(.{ .struct_type = .{
1455 .name = try self.resolveTypeName(ty),
14461456 .member_types = member_types[0..member_index],
14471457 } });
14481458
......@@ -1472,10 +1482,8 @@ pub const DeclGen = struct {
14721482 try member_names.append(try self.spv.resolveString(field_name));
14731483 }
14741484
1475 const name = ip.stringToSlice(try mod.declPtr(struct_type.decl.unwrap().?).getFullyQualifiedName(mod));
1476
14771485 const ty_ref = try self.spv.resolve(.{ .struct_type = .{
1478 .name = try self.spv.resolveString(name),
1486 .name = try self.resolveTypeName(ty),
14791487 .member_types = member_types.items,
14801488 .member_names = member_names.items,
14811489 } });
......@@ -1555,6 +1563,7 @@ pub const DeclGen = struct {
15551563 }
15561564
15571565 const ty_ref = try self.spv.resolve(.{ .struct_type = .{
1566 .name = try self.resolveTypeName(ty),
15581567 .member_types = &member_types,
15591568 .member_names = &member_names,
15601569 } });
src/link/SpirV.zig+2-2
......@@ -111,7 +111,7 @@ pub fn updateFunc(self: *SpirV, module: *Module, func_index: InternPool.Index, a
111111
112112 const func = module.funcInfo(func_index);
113113 const decl = module.declPtr(func.owner_decl);
114 log.debug("lowering function {s}", .{ module.intern_pool.stringToSlice(decl.name) });
114 log.debug("lowering function {s}", .{module.intern_pool.stringToSlice(decl.name)});
115115
116116 var decl_gen = codegen.DeclGen.init(self.base.allocator, module, &self.spv, &self.decl_link);
117117 defer decl_gen.deinit();
......@@ -127,7 +127,7 @@ pub fn updateDecl(self: *SpirV, module: *Module, decl_index: Module.Decl.Index)
127127 }
128128
129129 const decl = module.declPtr(decl_index);
130 log.debug("lowering declaration {s}", .{ module.intern_pool.stringToSlice(decl.name) });
130 log.debug("lowering declaration {s}", .{module.intern_pool.stringToSlice(decl.name)});
131131
132132 var decl_gen = codegen.DeclGen.init(self.base.allocator, module, &self.spv, &self.decl_link);
133133 defer decl_gen.deinit();