diff options
| author | Veikka Tuominen <git@vexu.eu> | 2022-08-21 17:27:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-21 17:27:52 +0300 |
| commit | 02070ae26b872aa4a1b3da4c1820a4a360c7ee92 (patch) | |
| tree | e9271c0fefbbfcba4ea4adb4ce182b378b92acc9 /src/codegen | |
| parent | 4a98385b0aa3808ab05a1ebfbc90fd0bcd97c0d9 (diff) | |
| parent | 20d0018d79c25a0def440040eab2970e7a314130 (diff) | |
| download | zig-02070ae26b872aa4a1b3da4c1820a4a360c7ee92.tar.gz zig-02070ae26b872aa4a1b3da4c1820a4a360c7ee92.zip | |
Merge pull request #12499 from Vexu/explain-why-called-at-comptime
stage2: add note about function call being comptime because of comptime only return type
Diffstat (limited to 'src/codegen')
| -rw-r--r-- | src/codegen/c.zig | 3 | ||||
| -rw-r--r-- | src/codegen/llvm.zig | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/codegen/c.zig b/src/codegen/c.zig index 81a892183f..4a09c09cc9 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -835,7 +835,6 @@ pub const DeclGen = struct { }, .Union => { const union_obj = val.castTag(.@"union").?.data; - const union_ty = ty.cast(Type.Payload.Union).?.data; const layout = ty.unionGetLayout(target); try writer.writeAll("("); @@ -851,7 +850,7 @@ pub const DeclGen = struct { try writer.writeAll(".payload = {"); } - const index = union_ty.tag_ty.enumTagFieldIndex(union_obj.tag, dg.module).?; + const index = ty.unionTagFieldIndex(union_obj.tag, dg.module).?; const field_ty = ty.unionFields().values()[index].ty; const field_name = ty.unionFields().keys()[index]; if (field_ty.hasRuntimeBits()) { diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index d50b463606..5c537cd5bc 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -3502,7 +3502,7 @@ pub const DeclGen = struct { }); } const union_obj = tv.ty.cast(Type.Payload.Union).?.data; - const field_index = union_obj.tag_ty.enumTagFieldIndex(tag_and_val.tag, dg.module).?; + const field_index = tv.ty.unionTagFieldIndex(tag_and_val.tag, dg.module).?; assert(union_obj.haveFieldTypes()); // Sometimes we must make an unnamed struct because LLVM does |