aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-10-28 17:23:02 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-10-28 17:23:02 -0700
commit1c93cf52d8b8acab469efe5d4457ed43d76bc6e5 (patch)
tree7f85f232fe39aeb3ab43d13dd29ecd70f9921d55 /src
parentc59ee3157f5a7fb5c6110422ea8215601285ea28 (diff)
downloadzig-1c93cf52d8b8acab469efe5d4457ed43d76bc6e5.tar.gz
zig-1c93cf52d8b8acab469efe5d4457ed43d76bc6e5.zip
C backend: fix crash when number of Decls passes a threshold
The ensureUnusedCapacity did not reserve a big enough number. I changed it to no longer guess the capacity because I saw that the number of possible items was not determinable ahead of time and this can therefore avoid allocating more memory than necessary.
Diffstat (limited to 'src')
-rw-r--r--src/link/C.zig13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/link/C.zig b/src/link/C.zig
index 86019b1cb7..5237d23a48 100644
--- a/src/link/C.zig
+++ b/src/link/C.zig
@@ -251,8 +251,8 @@ pub fn flushModule(self: *C, comp: *Compilation) !void {
var f: Flush = .{};
defer f.deinit(gpa);
- // This is at least enough until we get to the function bodies without error handling.
- try f.all_buffers.ensureTotalCapacity(gpa, self.decl_table.count() + 2);
+ // Covers zig.h and err_typedef_item.
+ try f.all_buffers.ensureUnusedCapacity(gpa, 2);
f.all_buffers.appendAssumeCapacity(.{
.iov_base = zig_h,
@@ -261,7 +261,8 @@ pub fn flushModule(self: *C, comp: *Compilation) !void {
f.file_size += zig_h.len;
const err_typedef_writer = f.err_typedef_buf.writer(gpa);
- const err_typedef_item = f.all_buffers.addOneAssumeCapacity();
+ const err_typedef_index = f.all_buffers.items.len;
+ f.all_buffers.items.len += 1;
render_errors: {
if (module.global_error_set.size == 0) break :render_errors;
@@ -291,7 +292,7 @@ pub fn flushModule(self: *C, comp: *Compilation) !void {
try flushDecl(self, &f, decl);
}
- err_typedef_item.* = .{
+ f.all_buffers.items[err_typedef_index] = .{
.iov_base = f.err_typedef_buf.items.ptr,
.iov_len = f.err_typedef_buf.items.len,
};
@@ -371,7 +372,7 @@ fn flushDecl(self: *C, f: *Flush, decl: *const Module.Decl) FlushDeclError!void
}
}
const buf = decl_block.fwd_decl.items;
- f.all_buffers.appendAssumeCapacity(.{
+ try f.all_buffers.append(gpa, .{
.iov_base = buf.ptr,
.iov_len = buf.len,
});
@@ -381,7 +382,7 @@ fn flushDecl(self: *C, f: *Flush, decl: *const Module.Decl) FlushDeclError!void
f.fn_count += 1;
} else if (decl_block.code.items.len != 0) {
const buf = decl_block.code.items;
- f.all_buffers.appendAssumeCapacity(.{
+ try f.all_buffers.append(gpa, .{
.iov_base = buf.ptr,
.iov_len = buf.len,
});