authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2021-11-01 00:54:04-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-11-04 14:54:25-04:00
loge97feb96e4daf7d53538c9c8773d50459a59e5ee
tree33474da46590a20370d970d033a3123b620b2f81
parentd03e9d0b8347a74d674bdafadb71e7ddd8fdfad1

Replace ArrayList.init/ensureTotalCapacity pairs with initCapacity

Because ArrayList.initCapacity uses 'precise' capacity allocation, this should save memory on average, and definitely will save memory in cases where ArrayList is used where a regular allocated slice could have also be used.

14 files changed, 42 insertions(+), 67 deletions(-)

lib/std/unicode.zig+6-9
...@@ -551,10 +551,9 @@ fn testDecode(bytes: []const u8) !u21 {...@@ -551,10 +551,9 @@ fn testDecode(bytes: []const u8) !u21 {
551551
552/// Caller must free returned memory.552/// Caller must free returned memory.
553pub fn utf16leToUtf8Alloc(allocator: *mem.Allocator, utf16le: []const u16) ![]u8 {553pub fn utf16leToUtf8Alloc(allocator: *mem.Allocator, utf16le: []const u16) ![]u8 {
554 var result = std.ArrayList(u8).init(allocator);
555 errdefer result.deinit();
556 // optimistically guess that it will all be ascii.554 // optimistically guess that it will all be ascii.
557 try result.ensureTotalCapacity(utf16le.len);555 var result = try std.ArrayList(u8).initCapacity(allocator, utf16le.len);
556 errdefer result.deinit();
558 var out_index: usize = 0;557 var out_index: usize = 0;
559 var it = Utf16LeIterator.init(utf16le);558 var it = Utf16LeIterator.init(utf16le);
560 while (try it.nextCodepoint()) |codepoint| {559 while (try it.nextCodepoint()) |codepoint| {
...@@ -569,10 +568,9 @@ pub fn utf16leToUtf8Alloc(allocator: *mem.Allocator, utf16le: []const u16) ![]u8...@@ -569,10 +568,9 @@ pub fn utf16leToUtf8Alloc(allocator: *mem.Allocator, utf16le: []const u16) ![]u8
569568
570/// Caller must free returned memory.569/// Caller must free returned memory.
571pub fn utf16leToUtf8AllocZ(allocator: *mem.Allocator, utf16le: []const u16) ![:0]u8 {570pub fn utf16leToUtf8AllocZ(allocator: *mem.Allocator, utf16le: []const u16) ![:0]u8 {
572 var result = std.ArrayList(u8).init(allocator);
573 errdefer result.deinit();
574 // optimistically guess that it will all be ascii.571 // optimistically guess that it will all be ascii.
575 try result.ensureTotalCapacity(utf16le.len);572 var result = try std.ArrayList(u8).initCapacity(allocator, utf16le.len);
573 errdefer result.deinit();
576 var out_index: usize = 0;574 var out_index: usize = 0;
577 var it = Utf16LeIterator.init(utf16le);575 var it = Utf16LeIterator.init(utf16le);
578 while (try it.nextCodepoint()) |codepoint| {576 while (try it.nextCodepoint()) |codepoint| {
...@@ -664,10 +662,9 @@ test "utf16leToUtf8" {...@@ -664,10 +662,9 @@ test "utf16leToUtf8" {
664}662}
665663
666pub fn utf8ToUtf16LeWithNull(allocator: *mem.Allocator, utf8: []const u8) ![:0]u16 {664pub fn utf8ToUtf16LeWithNull(allocator: *mem.Allocator, utf8: []const u8) ![:0]u16 {
667 var result = std.ArrayList(u16).init(allocator);
668 errdefer result.deinit();
669 // optimistically guess that it will not require surrogate pairs665 // optimistically guess that it will not require surrogate pairs
670 try result.ensureTotalCapacity(utf8.len + 1);666 var result = try std.ArrayList(u16).initCapacity(allocator, utf8.len + 1);
667 errdefer result.deinit();
671668
672 const view = try Utf8View.init(utf8);669 const view = try Utf8View.init(utf8);
673 var it = view.iterator();670 var it = view.iterator();
src/Compilation.zig+1-2
...@@ -3812,8 +3812,7 @@ fn detectLibCIncludeDirs(...@@ -3812,8 +3812,7 @@ fn detectLibCIncludeDirs(
3812}3812}
38133813
3814fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const LibCInstallation) !LibCDirs {3814fn detectLibCFromLibCInstallation(arena: *Allocator, target: Target, lci: *const LibCInstallation) !LibCDirs {
3815 var list = std.ArrayList([]const u8).init(arena);3815 var list = try std.ArrayList([]const u8).initCapacity(arena, 4);
3816 try list.ensureTotalCapacity(4);
38173816
3818 list.appendAssumeCapacity(lci.include_dir.?);3817 list.appendAssumeCapacity(lci.include_dir.?);
38193818
src/Sema.zig+3-4
...@@ -6219,12 +6219,11 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError...@@ -6219,12 +6219,11 @@ fn zirSwitchBlock(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
62196219
6220 try sema.requireRuntimeBlock(block, src);6220 try sema.requireRuntimeBlock(block, src);
62216221
6222 var cases_extra: std.ArrayListUnmanaged(u32) = .{};6222 const estimated_cases_extra = (scalar_cases_len + multi_cases_len) *
6223 @typeInfo(Air.SwitchBr.Case).Struct.fields.len + 2;
6224 var cases_extra = try std.ArrayListUnmanaged(u32).initCapacity(gpa, estimated_cases_extra);
6223 defer cases_extra.deinit(gpa);6225 defer cases_extra.deinit(gpa);
62246226
6225 try cases_extra.ensureTotalCapacity(gpa, (scalar_cases_len + multi_cases_len) *
6226 @typeInfo(Air.SwitchBr.Case).Struct.fields.len + 2);
6227
6228 var case_block = child_block.makeSubBlock();6227 var case_block = child_block.makeSubBlock();
6229 case_block.runtime_loop = null;6228 case_block.runtime_loop = null;
6230 case_block.runtime_cond = operand_src;6229 case_block.runtime_cond = operand_src;
src/codegen/llvm.zig+2-4
...@@ -849,8 +849,7 @@ pub const DeclGen = struct {...@@ -849,8 +849,7 @@ pub const DeclGen = struct {
849849
850 assert(struct_obj.haveFieldTypes());850 assert(struct_obj.haveFieldTypes());
851851
852 var llvm_field_types: std.ArrayListUnmanaged(*const llvm.Type) = .{};852 var llvm_field_types = try std.ArrayListUnmanaged(*const llvm.Type).initCapacity(gpa, struct_obj.fields.count());
853 try llvm_field_types.ensureTotalCapacity(gpa, struct_obj.fields.count());
854 defer llvm_field_types.deinit(gpa);853 defer llvm_field_types.deinit(gpa);
855854
856 for (struct_obj.fields.values()) |field| {855 for (struct_obj.fields.values()) |field| {
...@@ -1251,8 +1250,7 @@ pub const DeclGen = struct {...@@ -1251,8 +1250,7 @@ pub const DeclGen = struct {
1251 const field_vals = tv.val.castTag(.@"struct").?.data;1250 const field_vals = tv.val.castTag(.@"struct").?.data;
1252 const gpa = self.gpa;1251 const gpa = self.gpa;
12531252
1254 var llvm_fields: std.ArrayListUnmanaged(*const llvm.Value) = .{};1253 var llvm_fields = try std.ArrayListUnmanaged(*const llvm.Value).initCapacity(gpa, field_vals.len);
1255 try llvm_fields.ensureTotalCapacity(gpa, field_vals.len);
1256 defer llvm_fields.deinit(gpa);1254 defer llvm_fields.deinit(gpa);
12571255
1258 for (field_vals) |field_val, i| {1256 for (field_vals) |field_val, i| {
src/libcxx.zig+2-4
...@@ -109,8 +109,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {...@@ -109,8 +109,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
109109
110 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });110 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });
111 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });111 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });
112 var c_source_files = std.ArrayList(Compilation.CSourceFile).init(arena);112 var c_source_files = try std.ArrayList(Compilation.CSourceFile).initCapacity(arena, libcxx_files.len);
113 try c_source_files.ensureTotalCapacity(libcxx_files.len);
114113
115 for (libcxx_files) |cxx_src| {114 for (libcxx_files) |cxx_src| {
116 var cflags = std.ArrayList([]const u8).init(arena);115 var cflags = std.ArrayList([]const u8).init(arena);
...@@ -256,8 +255,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {...@@ -256,8 +255,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
256255
257 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });256 const cxxabi_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxxabi", "include" });
258 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });257 const cxx_include_path = try comp.zig_lib_directory.join(arena, &[_][]const u8{ "libcxx", "include" });
259 var c_source_files = std.ArrayList(Compilation.CSourceFile).init(arena);258 var c_source_files = try std.ArrayList(Compilation.CSourceFile).initCapacity(arena, libcxxabi_files.len);
260 try c_source_files.ensureTotalCapacity(libcxxabi_files.len);
261259
262 for (libcxxabi_files) |cxxabi_src| {260 for (libcxxabi_files) |cxxabi_src| {
263 var cflags = std.ArrayList([]const u8).init(arena);261 var cflags = std.ArrayList([]const u8).init(arena);
src/link.zig+2-2
...@@ -650,10 +650,10 @@ pub const File = struct {...@@ -650,10 +650,10 @@ pub const File = struct {
650 };650 };
651 }651 }
652652
653 var object_files = std.ArrayList([*:0]const u8).init(base.allocator);653 const num_object_files = base.options.objects.len + comp.c_object_table.count() + 2;
654 var object_files = try std.ArrayList([*:0]const u8).initCapacity(base.allocator, num_object_files);
654 defer object_files.deinit();655 defer object_files.deinit();
655656
656 try object_files.ensureTotalCapacity(base.options.objects.len + comp.c_object_table.count() + 2);
657 for (base.options.objects) |obj_path| {657 for (base.options.objects) |obj_path| {
658 object_files.appendAssumeCapacity(try arena.dupeZ(u8, obj_path));658 object_files.appendAssumeCapacity(try arena.dupeZ(u8, obj_path));
659 }659 }
src/link/C.zig+2-3
...@@ -397,11 +397,10 @@ pub fn flushEmitH(module: *Module) !void {...@@ -397,11 +397,10 @@ pub fn flushEmitH(module: *Module) !void {
397 const emit_h = module.emit_h orelse return;397 const emit_h = module.emit_h orelse return;
398398
399 // We collect a list of buffers to write, and write them all at once with pwritev 😎399 // We collect a list of buffers to write, and write them all at once with pwritev 😎
400 var all_buffers = std.ArrayList(std.os.iovec_const).init(module.gpa);400 const num_buffers = emit_h.decl_table.count() + 1;
401 var all_buffers = try std.ArrayList(std.os.iovec_const).initCapacity(module.gpa, num_buffers);
401 defer all_buffers.deinit();402 defer all_buffers.deinit();
402403
403 try all_buffers.ensureTotalCapacity(emit_h.decl_table.count() + 1);
404
405 var file_size: u64 = zig_h.len;404 var file_size: u64 = zig_h.len;
406 all_buffers.appendAssumeCapacity(.{405 all_buffers.appendAssumeCapacity(.{
407 .iov_base = zig_h,406 .iov_base = zig_h,
src/link/Elf.zig+10-16
...@@ -851,12 +851,11 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {...@@ -851,12 +851,11 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
851 const last_dbg_info_decl = self.dbg_info_decl_last.?;851 const last_dbg_info_decl = self.dbg_info_decl_last.?;
852 const debug_info_sect = &self.sections.items[self.debug_info_section_index.?];852 const debug_info_sect = &self.sections.items[self.debug_info_section_index.?];
853853
854 var di_buf = std.ArrayList(u8).init(self.base.allocator);
855 defer di_buf.deinit();
856
857 // We have a function to compute the upper bound size, because it's needed854 // We have a function to compute the upper bound size, because it's needed
858 // for determining where to put the offset of the first `LinkBlock`.855 // for determining where to put the offset of the first `LinkBlock`.
859 try di_buf.ensureTotalCapacity(self.dbgInfoNeededHeaderBytes());856 const needed_bytes = self.dbgInfoNeededHeaderBytes();
857 var di_buf = try std.ArrayList(u8).initCapacity(self.base.allocator, needed_bytes);
858 defer di_buf.deinit();
860859
861 // initial length - length of the .debug_info contribution for this compilation unit,860 // initial length - length of the .debug_info contribution for this compilation unit,
862 // not including the initial length itself.861 // not including the initial length itself.
...@@ -920,12 +919,10 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {...@@ -920,12 +919,10 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
920 if (self.debug_aranges_section_dirty) {919 if (self.debug_aranges_section_dirty) {
921 const debug_aranges_sect = &self.sections.items[self.debug_aranges_section_index.?];920 const debug_aranges_sect = &self.sections.items[self.debug_aranges_section_index.?];
922921
923 var di_buf = std.ArrayList(u8).init(self.base.allocator);
924 defer di_buf.deinit();
925
926 // Enough for all the data without resizing. When support for more compilation units922 // Enough for all the data without resizing. When support for more compilation units
927 // is added, the size of this section will become more variable.923 // is added, the size of this section will become more variable.
928 try di_buf.ensureTotalCapacity(100);924 var di_buf = try std.ArrayList(u8).initCapacity(self.base.allocator, 100);
925 defer di_buf.deinit();
929926
930 // initial length - length of the .debug_aranges contribution for this compilation unit,927 // initial length - length of the .debug_aranges contribution for this compilation unit,
931 // not including the initial length itself.928 // not including the initial length itself.
...@@ -998,13 +995,12 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {...@@ -998,13 +995,12 @@ pub fn flushModule(self: *Elf, comp: *Compilation) !void {
998995
999 const debug_line_sect = &self.sections.items[self.debug_line_section_index.?];996 const debug_line_sect = &self.sections.items[self.debug_line_section_index.?];
1000997
1001 var di_buf = std.ArrayList(u8).init(self.base.allocator);
1002 defer di_buf.deinit();
1003
1004 // The size of this header is variable, depending on the number of directories,998 // The size of this header is variable, depending on the number of directories,
1005 // files, and padding. We have a function to compute the upper bound size, however,999 // files, and padding. We have a function to compute the upper bound size, however,
1006 // because it's needed for determining where to put the offset of the first `SrcFn`.1000 // because it's needed for determining where to put the offset of the first `SrcFn`.
1007 try di_buf.ensureTotalCapacity(self.dbgLineNeededHeaderBytes());1001 const needed_bytes = self.dbgLineNeededHeaderBytes();
1002 var di_buf = try std.ArrayList(u8).initCapacity(self.base.allocator, needed_bytes);
1003 defer di_buf.deinit();
10081004
1009 // initial length - length of the .debug_line contribution for this compilation unit,1005 // initial length - length of the .debug_line contribution for this compilation unit,
1010 // not including the initial length itself.1006 // not including the initial length itself.
...@@ -2300,7 +2296,8 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven...@@ -2300,7 +2296,8 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven
2300 var code_buffer = std.ArrayList(u8).init(self.base.allocator);2296 var code_buffer = std.ArrayList(u8).init(self.base.allocator);
2301 defer code_buffer.deinit();2297 defer code_buffer.deinit();
23022298
2303 var dbg_line_buffer = std.ArrayList(u8).init(self.base.allocator);2299 // For functions we need to add a prologue to the debug line program.
2300 var dbg_line_buffer = try std.ArrayList(u8).initCapacity(self.base.allocator, 26);
2304 defer dbg_line_buffer.deinit();2301 defer dbg_line_buffer.deinit();
23052302
2306 var dbg_info_buffer = std.ArrayList(u8).init(self.base.allocator);2303 var dbg_info_buffer = std.ArrayList(u8).init(self.base.allocator);
...@@ -2309,9 +2306,6 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven...@@ -2309,9 +2306,6 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven
2309 var dbg_info_type_relocs: File.DbgInfoTypeRelocsTable = .{};2306 var dbg_info_type_relocs: File.DbgInfoTypeRelocsTable = .{};
2310 defer deinitRelocs(self.base.allocator, &dbg_info_type_relocs);2307 defer deinitRelocs(self.base.allocator, &dbg_info_type_relocs);
23112308
2312 // For functions we need to add a prologue to the debug line program.
2313 try dbg_line_buffer.ensureTotalCapacity(26);
2314
2315 const decl = func.owner_decl;2309 const decl = func.owner_decl;
2316 const line_off = @intCast(u28, decl.src_line + func.lbrace_line);2310 const line_off = @intCast(u28, decl.src_line + func.lbrace_line);
23172311
src/link/MachO.zig+1-2
...@@ -5323,8 +5323,7 @@ fn snapshotState(self: *MachO) !void {...@@ -5323,8 +5323,7 @@ fn snapshotState(self: *MachO) !void {
5323 node.payload.aliases = aliases.toOwnedSlice();5323 node.payload.aliases = aliases.toOwnedSlice();
5324 try nodes.append(node);5324 try nodes.append(node);
53255325
5326 var relocs = std.ArrayList(Snapshot.Node).init(arena);5326 var relocs = try std.ArrayList(Snapshot.Node).initCapacity(arena, atom.relocs.items.len);
5327 try relocs.ensureTotalCapacity(atom.relocs.items.len);
5328 for (atom.relocs.items) |rel| {5327 for (atom.relocs.items) |rel| {
5329 const arch = self.base.options.target.cpu.arch;5328 const arch = self.base.options.target.cpu.arch;
5330 const source_addr = blk: {5329 const source_addr = blk: {
src/link/MachO/DebugSymbols.zig+8-12
...@@ -348,12 +348,11 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt...@@ -348,12 +348,11 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt
348 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;348 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;
349 const debug_info_sect = &dwarf_segment.sections.items[self.debug_info_section_index.?];349 const debug_info_sect = &dwarf_segment.sections.items[self.debug_info_section_index.?];
350350
351 var di_buf = std.ArrayList(u8).init(allocator);
352 defer di_buf.deinit();
353
354 // We have a function to compute the upper bound size, because it's needed351 // We have a function to compute the upper bound size, because it's needed
355 // for determining where to put the offset of the first `LinkBlock`.352 // for determining where to put the offset of the first `LinkBlock`.
356 try di_buf.ensureTotalCapacity(self.dbgInfoNeededHeaderBytes());353 const needed_bytes = self.dbgInfoNeededHeaderBytes();
354 var di_buf = try std.ArrayList(u8).initCapacity(allocator, needed_bytes);
355 defer di_buf.deinit();
357356
358 // initial length - length of the .debug_info contribution for this compilation unit,357 // initial length - length of the .debug_info contribution for this compilation unit,
359 // not including the initial length itself.358 // not including the initial length itself.
...@@ -403,12 +402,10 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt...@@ -403,12 +402,10 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt
403 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;402 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;
404 const debug_aranges_sect = &dwarf_segment.sections.items[self.debug_aranges_section_index.?];403 const debug_aranges_sect = &dwarf_segment.sections.items[self.debug_aranges_section_index.?];
405404
406 var di_buf = std.ArrayList(u8).init(allocator);
407 defer di_buf.deinit();
408
409 // Enough for all the data without resizing. When support for more compilation units405 // Enough for all the data without resizing. When support for more compilation units
410 // is added, the size of this section will become more variable.406 // is added, the size of this section will become more variable.
411 try di_buf.ensureTotalCapacity(100);407 var di_buf = try std.ArrayList(u8).initCapacity(allocator, 100);
408 defer di_buf.deinit();
412409
413 // initial length - length of the .debug_aranges contribution for this compilation unit,410 // initial length - length of the .debug_aranges contribution for this compilation unit,
414 // not including the initial length itself.411 // not including the initial length itself.
...@@ -473,13 +470,12 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt...@@ -473,13 +470,12 @@ pub fn flushModule(self: *DebugSymbols, allocator: *Allocator, options: link.Opt
473 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;470 const dwarf_segment = &self.load_commands.items[self.dwarf_segment_cmd_index.?].Segment;
474 const debug_line_sect = &dwarf_segment.sections.items[self.debug_line_section_index.?];471 const debug_line_sect = &dwarf_segment.sections.items[self.debug_line_section_index.?];
475472
476 var di_buf = std.ArrayList(u8).init(allocator);
477 defer di_buf.deinit();
478
479 // The size of this header is variable, depending on the number of directories,473 // The size of this header is variable, depending on the number of directories,
480 // files, and padding. We have a function to compute the upper bound size, however,474 // files, and padding. We have a function to compute the upper bound size, however,
481 // because it's needed for determining where to put the offset of the first `SrcFn`.475 // because it's needed for determining where to put the offset of the first `SrcFn`.
482 try di_buf.ensureTotalCapacity(self.dbgLineNeededHeaderBytes(module));476 const needed_bytes = self.dbgLineNeededHeaderBytes(module);
477 var di_buf = try std.ArrayList(u8).initCapacity(allocator, needed_bytes);
478 defer di_buf.deinit();
483479
484 // initial length - length of the .debug_line contribution for this compilation unit,480 // initial length - length of the .debug_line contribution for this compilation unit,
485 // not including the initial length itself.481 // not including the initial length itself.
src/link/MachO/Object.zig+1-2
...@@ -393,9 +393,8 @@ pub fn parseIntoAtoms(self: *Object, allocator: *Allocator, macho_file: *MachO)...@@ -393,9 +393,8 @@ pub fn parseIntoAtoms(self: *Object, allocator: *Allocator, macho_file: *MachO)
393 // local < extern defined < undefined. Unfortunately, this is not guaranteed! For instance,393 // local < extern defined < undefined. Unfortunately, this is not guaranteed! For instance,
394 // the GO compiler does not necessarily respect that therefore we sort immediately by type394 // the GO compiler does not necessarily respect that therefore we sort immediately by type
395 // and address within.395 // and address within.
396 var sorted_all_nlists = std.ArrayList(NlistWithIndex).init(allocator);396 var sorted_all_nlists = try std.ArrayList(NlistWithIndex).initCapacity(allocator, self.symtab.items.len);
397 defer sorted_all_nlists.deinit();397 defer sorted_all_nlists.deinit();
398 try sorted_all_nlists.ensureTotalCapacity(self.symtab.items.len);
399398
400 for (self.symtab.items) |nlist, index| {399 for (self.symtab.items) |nlist, index| {
401 sorted_all_nlists.appendAssumeCapacity(.{400 sorted_all_nlists.appendAssumeCapacity(.{
src/main.zig+1-2
...@@ -2866,8 +2866,7 @@ pub fn cmdInit(...@@ -2866,8 +2866,7 @@ pub fn cmdInit(
2866 const build_zig_contents = template_dir.readFileAlloc(arena, "build.zig", max_bytes) catch |err| {2866 const build_zig_contents = template_dir.readFileAlloc(arena, "build.zig", max_bytes) catch |err| {
2867 fatal("unable to read template file 'build.zig': {s}", .{@errorName(err)});2867 fatal("unable to read template file 'build.zig': {s}", .{@errorName(err)});
2868 };2868 };
2869 var modified_build_zig_contents = std.ArrayList(u8).init(arena);2869 var modified_build_zig_contents = try std.ArrayList(u8).initCapacity(arena, build_zig_contents.len);
2870 try modified_build_zig_contents.ensureTotalCapacity(build_zig_contents.len);
2871 for (build_zig_contents) |c| {2870 for (build_zig_contents) |c| {
2872 if (c == '$') {2871 if (c == '$') {
2873 try modified_build_zig_contents.appendSlice(cwd_basename);2872 try modified_build_zig_contents.appendSlice(cwd_basename);
src/translate_c.zig+2-3
...@@ -4901,10 +4901,9 @@ fn finishTransFnProto(...@@ -4901,10 +4901,9 @@ fn finishTransFnProto(
49014901
4902 // TODO check for align attribute4902 // TODO check for align attribute
49034903
4904 var fn_params = std.ArrayList(ast.Payload.Param).init(c.gpa);
4905 defer fn_params.deinit();
4906 const param_count: usize = if (fn_proto_ty != null) fn_proto_ty.?.getNumParams() else 0;4904 const param_count: usize = if (fn_proto_ty != null) fn_proto_ty.?.getNumParams() else 0;
4907 try fn_params.ensureTotalCapacity(param_count);4905 var fn_params = try std.ArrayList(ast.Payload.Param).initCapacity(c.gpa, param_count);
4906 defer fn_params.deinit();
49084907
4909 var i: usize = 0;4908 var i: usize = 0;
4910 while (i < param_count) : (i += 1) {4909 while (i < param_count) : (i += 1) {
src/translate_c/ast.zig+1-2
...@@ -2787,9 +2787,8 @@ fn renderMacroFunc(c: *Context, node: Node) !NodeIndex {...@@ -2787,9 +2787,8 @@ fn renderMacroFunc(c: *Context, node: Node) !NodeIndex {
27872787
2788fn renderParams(c: *Context, params: []Payload.Param, is_var_args: bool) !std.ArrayList(NodeIndex) {2788fn renderParams(c: *Context, params: []Payload.Param, is_var_args: bool) !std.ArrayList(NodeIndex) {
2789 _ = try c.addToken(.l_paren, "(");2789 _ = try c.addToken(.l_paren, "(");
2790 var rendered = std.ArrayList(NodeIndex).init(c.gpa);2790 var rendered = try std.ArrayList(NodeIndex).initCapacity(c.gpa, std.math.max(params.len, 1));
2791 errdefer rendered.deinit();2791 errdefer rendered.deinit();
2792 try rendered.ensureTotalCapacity(std.math.max(params.len, 1));
27932792
2794 for (params) |param, i| {2793 for (params) |param, i| {
2795 if (i != 0) _ = try c.addToken(.comma, ",");2794 if (i != 0) _ = try c.addToken(.comma, ",");