diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-09-03 23:52:19 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-09-03 23:52:19 -0700 |
| commit | 338f155a02b72117ff710f72c8578e7d2f8eb296 (patch) | |
| tree | a902526d5dc901de7458ef318f52f5ac0dad77e7 /src-self-hosted/codegen | |
| parent | c354f074fa91d3d1672469ba4bbc49a1730e1d01 (diff) | |
| parent | 88724b2a89157ecc3a8eea03aa0f8a6b66829915 (diff) | |
| download | zig-338f155a02b72117ff710f72c8578e7d2f8eb296.tar.gz zig-338f155a02b72117ff710f72c8578e7d2f8eb296.zip | |
Merge remote-tracking branch 'origin/master' into llvm11
Diffstat (limited to 'src-self-hosted/codegen')
| -rw-r--r-- | src-self-hosted/codegen/c.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src-self-hosted/codegen/c.zig b/src-self-hosted/codegen/c.zig index 9a7a4888be..34ddcfbb3b 100644 --- a/src-self-hosted/codegen/c.zig +++ b/src-self-hosted/codegen/c.zig @@ -85,7 +85,7 @@ fn genArray(file: *C, decl: *Decl) !void { const name = try map(file.base.allocator, mem.span(decl.name)); defer file.base.allocator.free(name); if (tv.val.cast(Value.Payload.Bytes)) |payload| - if (tv.ty.arraySentinel()) |sentinel| + if (tv.ty.sentinel()) |sentinel| if (sentinel.toUnsignedInt() == 0) try file.constants.writer().print("const char *const {} = \"{}\";\n", .{ name, payload.data }) else @@ -110,7 +110,8 @@ const Context = struct { } fn deinit(self: *Context) void { - for (self.inst_map.items()) |kv| { + var it = self.inst_map.iterator(); + while (it.next()) |kv| { self.file.base.allocator.free(kv.value); } self.inst_map.deinit(); |