Commit b03d34429d059dc3f6056d7f780dc623c96523b4 | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-07-16 23:17:45-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-07-18 19:02:06-07:00
log	b03d34429d059dc3f6056d7f780dc623c96523b4
tree	481abfc5bf9ba31e2e9934c4c2616861010df40b
parent	d15e8f8017758fb77dd6e839ef3f39b174522c5c

compiler: work around slightly different generics semantics

Both of these cases are interesting, were not covered by behavior tests,
and should be inspected carefully with regards to the language
specification.

2 files changed, 11 insertions(+), 2 deletions(-)

src
- Zir.zig
- codegen
  - c.zig

src/Zir.zig+5-1

 @@ -65,9 +65,13 @@ pub const ExtraIndex = enum(u32) {
     _,
 };
+fn ExtraData(comptime T: type) type {
+    return struct { data: T, end: usize };
+}
 /// Returns the requested data, as well as the new index which is at the start of the
 /// trailers for the object.
-pub fn extraData(code: Zir, comptime T: type, index: usize) struct { data: T, end: usize } {
+pub fn extraData(code: Zir, comptime T: type, index: usize) ExtraData(T) {
     const fields = @typeInfo(T).Struct.fields;
     var i: usize = index;
     var result: T = undefined;

src/codegen/c.zig+6-1

 @@ -1802,7 +1802,12 @@ pub const DeclGen = struct {
         }
     }
-    fn writeCValueMember(dg: *DeclGen, writer: anytype, c_value: CValue, member: CValue) !void {
+    fn writeCValueMember(
+        dg: *DeclGen,
+        writer: anytype,
+        c_value: CValue,
+        member: CValue,
+    ) error{ OutOfMemory, AnalysisFail }!void {
         try dg.writeCValue(writer, c_value);
         try writer.writeByte('.');
         try dg.writeCValue(writer, member);