authorgravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-12-03 18:07:49-05:00
committergravatar for jacobly@ziglang.orgJacob Young <jacobly@ziglang.org> 2023-12-03 18:18:09-05:00
log0be7c23f111eeda5ed65c065ad65a6febd12f20c
treee955075ea98ba3e60b72d70d2187927cc51f66df
parent7c85ea65ba9f85be44aa8af3745a6038b132bd7f

Coff: minor fixes

* Update the msdos stub to be eight bytes smaller, which moves the machine PE header field into the first 128 bytes of the file, allowing it to be matched by a binfmt_misc magic sequence. This allows the build system to get the correct error during exec. * Fix library name memory leaks in Sema.

3 files changed, 15 insertions(+), 17 deletions(-)

src/Sema.zig+13-17
......@@ -9069,7 +9069,7 @@ fn handleExternLibName(
90699069 block: *Block,
90709070 src_loc: LazySrcLoc,
90719071 lib_name: []const u8,
9072) CompileError![:0]u8 {
9072) CompileError!void {
90739073 blk: {
90749074 const mod = sema.mod;
90759075 const comp = mod.comp;
......@@ -9117,7 +9117,6 @@ fn handleExternLibName(
91179117 });
91189118 };
91199119 }
9120 return sema.gpa.dupeZ(u8, lib_name);
91219120}
91229121
91239122/// These are calling conventions that are confirmed to work with variadic functions.
......@@ -9422,15 +9421,13 @@ fn funcCommon(
94229421 assert(section != .generic);
94239422 assert(address_space != null);
94249423 assert(!is_generic);
9424 if (opt_lib_name) |lib_name| try sema.handleExternLibName(block, .{
9425 .node_offset_lib_name = src_node_offset,
9426 }, lib_name);
94259427 const func_index = try ip.getExternFunc(gpa, .{
94269428 .ty = func_ty,
94279429 .decl = sema.owner_decl_index,
9428 .lib_name = if (opt_lib_name) |lib_name| (try mod.intern_pool.getOrPutString(
9429 gpa,
9430 try sema.handleExternLibName(block, .{
9431 .node_offset_lib_name = src_node_offset,
9432 }, lib_name),
9433 )).toOptional() else .none,
9430 .lib_name = try mod.intern_pool.getOrPutStringOpt(gpa, opt_lib_name),
94349431 });
94359432 return finishFunc(
94369433 sema,
......@@ -24688,10 +24685,11 @@ fn zirVarExtended(
2468824685
2468924686 var extra_index: usize = extra.end;
2469024687
24691 const lib_name: ?[]const u8 = if (small.has_lib_name) blk: {
24688 const lib_name = if (small.has_lib_name) lib_name: {
2469224689 const lib_name = sema.code.nullTerminatedString(sema.code.extra[extra_index]);
2469324690 extra_index += 1;
24694 break :blk lib_name;
24691 try sema.handleExternLibName(block, ty_src, lib_name);
24692 break :lib_name lib_name;
2469524693 } else null;
2469624694
2469724695 // ZIR supports encoding this information but it is not used; the information
......@@ -24729,10 +24727,7 @@ fn zirVarExtended(
2472924727 .ty = var_ty.toIntern(),
2473024728 .init = init_val,
2473124729 .decl = sema.owner_decl_index,
24732 .lib_name = if (lib_name) |lname| (try mod.intern_pool.getOrPutString(
24733 sema.gpa,
24734 try sema.handleExternLibName(block, ty_src, lname),
24735 )).toOptional() else .none,
24730 .lib_name = try mod.intern_pool.getOrPutStringOpt(sema.gpa, lib_name),
2473624731 .is_extern = small.is_extern,
2473724732 .is_threadlocal = small.is_threadlocal,
2473824733 } })));
......@@ -25177,12 +25172,13 @@ fn resolveExternOptions(
2517725172 .needed_comptime_reason = "threadlocality of the extern symbol must be comptime-known",
2517825173 });
2517925174
25180 const library_name = if (library_name_val.optionalValue(mod)) |payload| blk: {
25181 const library_name = try payload.toAllocatedBytes(Type.slice_const_u8, sema.arena, mod);
25175 const library_name = if (library_name_val.optionalValue(mod)) |library_name_payload| library_name: {
25176 const library_name = try library_name_payload.toAllocatedBytes(Type.slice_const_u8, sema.arena, mod);
2518225177 if (library_name.len == 0) {
2518325178 return sema.fail(block, library_src, "library name cannot be empty", .{});
2518425179 }
25185 break :blk try sema.handleExternLibName(block, library_src, library_name);
25180 try sema.handleExternLibName(block, library_src, library_name);
25181 break :library_name library_name;
2518625182 } else null;
2518725183
2518825184 if (name.len == 0) {
src/link/Coff.zig+2
......@@ -316,6 +316,8 @@ pub fn deinit(self: *Coff) void {
316316 }
317317 self.import_tables.deinit(gpa);
318318
319 self.lazy_syms.deinit(gpa);
320
319321 for (self.decls.values()) |*metadata| {
320322 metadata.deinit(gpa);
321323 }
src/link/msdos-stub.bin
Binary files a/src/link/msdos-stub.bin and b/src/link/msdos-stub.bin differ