diff options
| author | Jacob Young <jacobly0@users.noreply.github.com> | 2023-05-26 16:04:53 -0400 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2023-06-10 20:47:55 -0700 |
| commit | 9cd0ca9f482ef7f76d3f3ca683913e9aceaa47fe (patch) | |
| tree | 86e9cfb93f1cf8b68aebc83877bef7c24aed47a6 /src/link/Coff.zig | |
| parent | d5f0ee0d62e48e623625779a0cf722c3f0f66921 (diff) | |
| download | zig-9cd0ca9f482ef7f76d3f3ca683913e9aceaa47fe.tar.gz zig-9cd0ca9f482ef7f76d3f3ca683913e9aceaa47fe.zip | |
Module: rename functions to make ownership checks explicit
This makes the difference between `decl.getOwnedFunction` and
`decl.val.getFunction` more clear when reading the code.
Diffstat (limited to 'src/link/Coff.zig')
| -rw-r--r-- | src/link/Coff.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/link/Coff.zig b/src/link/Coff.zig index f4ee2fde97..8b76e8dd69 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1156,10 +1156,10 @@ pub fn updateDecl( const decl = mod.declPtr(decl_index); - if (decl.getExternFunc(mod)) |_| { + if (decl.val.getExternFunc(mod)) |_| { return; // TODO Should we do more when front-end analyzed extern decl? } - if (decl.getVariable(mod)) |variable| { + if (decl.val.getVariable(mod)) |variable| { if (variable.is_extern) { return; // TODO Should we do more when front-end analyzed extern decl? } @@ -1172,7 +1172,7 @@ pub fn updateDecl( var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - const decl_val = if (decl.getVariable(mod)) |variable| variable.init.toValue() else decl.val; + const decl_val = if (decl.val.getVariable(mod)) |variable| variable.init.toValue() else decl.val; const res = try codegen.generateSymbol(&self.base, decl.srcLoc(mod), .{ .ty = decl.ty, .val = decl_val, @@ -1313,7 +1313,7 @@ fn getDeclOutputSection(self: *Coff, decl_index: Module.Decl.Index) u16 { // TODO: what if this is a function pointer? .Fn => break :blk self.text_section_index.?, else => { - if (decl.getVariable(mod)) |_| { + if (val.getVariable(mod)) |_| { break :blk self.data_section_index.?; } break :blk self.rdata_section_index.?; @@ -1425,7 +1425,7 @@ pub fn updateDeclExports( // detect the default subsystem. for (exports) |exp| { const exported_decl = mod.declPtr(exp.exported_decl); - if (exported_decl.getFunctionIndex(mod) == .none) continue; + if (exported_decl.getOwnedFunctionIndex(mod) == .none) continue; const winapi_cc = switch (self.base.options.target.cpu.arch) { .x86 => std.builtin.CallingConvention.Stdcall, else => std.builtin.CallingConvention.C, |