Commit 0be7c23f111eeda5ed65c065ad65a6febd12f20c | zig

author	Jacob Young <jacobly@ziglang.org> 2023-12-03 18:07:49-05:00
committer	Jacob Young <jacobly@ziglang.org> 2023-12-03 18:18:09-05:00
log	0be7c23f111eeda5ed65c065ad65a6febd12f20c
tree	e955075ea98ba3e60b72d70d2187927cc51f66df
parent	7c85ea65ba9f85be44aa8af3745a6038b132bd7f

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
- link
  - Coff.zig
  - msdos-stub.bin

src/Sema.zig+13-17

 @@ -9069,7 +9069,7 @@ fn handleExternLibName(
     block: *Block,
     src_loc: LazySrcLoc,
     lib_name: []const u8,
-) CompileError![:0]u8 {
+) CompileError!void {
     blk: {
         const mod = sema.mod;
         const comp = mod.comp;
 @@ -9117,7 +9117,6 @@ fn handleExternLibName(
             });
         };
     }
-    return sema.gpa.dupeZ(u8, lib_name);
 }
 /// These are calling conventions that are confirmed to work with variadic functions.
 @@ -9422,15 +9421,13 @@ fn funcCommon(
         assert(section != .generic);
         assert(address_space != null);
         assert(!is_generic);
+        if (opt_lib_name) |lib_name| try sema.handleExternLibName(block, .{
+            .node_offset_lib_name = src_node_offset,
+        }, lib_name);
         const func_index = try ip.getExternFunc(gpa, .{
             .ty = func_ty,
             .decl = sema.owner_decl_index,
-            .lib_name = if (opt_lib_name) |lib_name| (try mod.intern_pool.getOrPutString(
+            .lib_name = try mod.intern_pool.getOrPutStringOpt(gpa, opt_lib_name),
-                gpa,
-                try sema.handleExternLibName(block, .{
-                    .node_offset_lib_name = src_node_offset,
-                }, lib_name),
-            )).toOptional() else .none,
         });
         return finishFunc(
             sema,
 @@ -24688,10 +24685,11 @@ fn zirVarExtended(
     var extra_index: usize = extra.end;
-    const lib_name: ?[]const u8 = if (small.has_lib_name) blk: {
+    const lib_name = if (small.has_lib_name) lib_name: {
         const lib_name = sema.code.nullTerminatedString(sema.code.extra[extra_index]);
         extra_index += 1;
-        break :blk lib_name;
+        try sema.handleExternLibName(block, ty_src, lib_name);
+        break :lib_name lib_name;
     } else null;
     // ZIR supports encoding this information but it is not used; the information
 @@ -24729,10 +24727,7 @@ fn zirVarExtended(
         .ty = var_ty.toIntern(),
         .init = init_val,
         .decl = sema.owner_decl_index,
-        .lib_name = if (lib_name) |lname| (try mod.intern_pool.getOrPutString(
+        .lib_name = try mod.intern_pool.getOrPutStringOpt(sema.gpa, lib_name),
-            sema.gpa,
-            try sema.handleExternLibName(block, ty_src, lname),
-        )).toOptional() else .none,
         .is_extern = small.is_extern,
         .is_threadlocal = small.is_threadlocal,
     } })));
 @@ -25177,12 +25172,13 @@ fn resolveExternOptions(
         .needed_comptime_reason = "threadlocality of the extern symbol must be comptime-known",
     });
-    const library_name = if (library_name_val.optionalValue(mod)) |payload| blk: {
+    const library_name = if (library_name_val.optionalValue(mod)) |library_name_payload| library_name: {
-        const library_name = try payload.toAllocatedBytes(Type.slice_const_u8, sema.arena, mod);
+        const library_name = try library_name_payload.toAllocatedBytes(Type.slice_const_u8, sema.arena, mod);
         if (library_name.len == 0) {
             return sema.fail(block, library_src, "library name cannot be empty", .{});
         }
-        break :blk try sema.handleExternLibName(block, library_src, library_name);
+        try sema.handleExternLibName(block, library_src, library_name);
+        break :library_name library_name;
     } else null;
     if (name.len == 0) {

src/link/Coff.zig+2

...	@@ -316,6 +316,8 @@ pub fn deinit(self: *Coff) void {	...	@@ -316,6 +316,8 @@ pub fn deinit(self: *Coff) void {
316	}	316	}
317	self.import_tables.deinit(gpa);	317	self.import_tables.deinit(gpa);
318		318
		319	self.lazy_syms.deinit(gpa);
		320
319	for (self.decls.values()) \|*metadata\| {	321	for (self.decls.values()) \|*metadata\| {
320	metadata.deinit(gpa);	322	metadata.deinit(gpa);
321	}	323	}

src/link/msdos-stub.bin

Binary files a/src/link/msdos-stub.bin and b/src/link/msdos-stub.bin differ