diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2024-07-14 17:32:51 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-14 17:32:51 -0700 |
| commit | d404d8a3637bc30dffc736e5fa1a68b8af0e19cb (patch) | |
| tree | 2f668bf2a185fe788fa20753ae6d8462778c4204 /src/link | |
| parent | 464537db62e1d4ca6bc1357135b0f6c451e48c17 (diff) | |
| parent | ad55fb7a209e1b9d41b8d4f1d3e48211ff20d2f9 (diff) | |
| download | zig-d404d8a3637bc30dffc736e5fa1a68b8af0e19cb.tar.gz zig-d404d8a3637bc30dffc736e5fa1a68b8af0e19cb.zip | |
Merge pull request #20593 from jacobly0/more-races
InternPool: fix more races
Diffstat (limited to 'src/link')
| -rw-r--r-- | src/link/Coff.zig | 2 | ||||
| -rw-r--r-- | src/link/Elf/ZigObject.zig | 2 | ||||
| -rw-r--r-- | src/link/MachO/ZigObject.zig | 2 | ||||
| -rw-r--r-- | src/link/Plan9.zig | 2 | ||||
| -rw-r--r-- | src/link/Wasm/ZigObject.zig | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/link/Coff.zig b/src/link/Coff.zig index 84d26b7610..732ceb85a6 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1156,7 +1156,7 @@ pub fn updateFunc(self: *Coff, pt: Zcu.PerThread, func_index: InternPool.Index, const code = switch (res) { .ok => code_buffer.items, .fail => |em| { - func.analysis(&mod.intern_pool).state = .codegen_failure; + func.setAnalysisState(&mod.intern_pool, .codegen_failure); try mod.failed_analysis.put(mod.gpa, AnalUnit.wrap(.{ .decl = decl_index }), em); return; }, diff --git a/src/link/Elf/ZigObject.zig b/src/link/Elf/ZigObject.zig index 46c0fd23a3..e8ec5eb492 100644 --- a/src/link/Elf/ZigObject.zig +++ b/src/link/Elf/ZigObject.zig @@ -1093,7 +1093,7 @@ pub fn updateFunc( const code = switch (res) { .ok => code_buffer.items, .fail => |em| { - func.analysis(&mod.intern_pool).state = .codegen_failure; + func.setAnalysisState(&mod.intern_pool, .codegen_failure); try mod.failed_analysis.put(mod.gpa, AnalUnit.wrap(.{ .decl = decl_index }), em); return; }, diff --git a/src/link/MachO/ZigObject.zig b/src/link/MachO/ZigObject.zig index 79e1ae4e02..b59b6a6720 100644 --- a/src/link/MachO/ZigObject.zig +++ b/src/link/MachO/ZigObject.zig @@ -699,7 +699,7 @@ pub fn updateFunc( const code = switch (res) { .ok => code_buffer.items, .fail => |em| { - func.analysis(&mod.intern_pool).state = .codegen_failure; + func.setAnalysisState(&mod.intern_pool, .codegen_failure); try mod.failed_analysis.put(mod.gpa, AnalUnit.wrap(.{ .decl = decl_index }), em); return; }, diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index 091aee54c4..e954bf7004 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -449,7 +449,7 @@ pub fn updateFunc(self: *Plan9, pt: Zcu.PerThread, func_index: InternPool.Index, const code = switch (res) { .ok => try code_buffer.toOwnedSlice(), .fail => |em| { - func.analysis(&mod.intern_pool).state = .codegen_failure; + func.setAnalysisState(&mod.intern_pool, .codegen_failure); try mod.failed_analysis.put(mod.gpa, AnalUnit.wrap(.{ .decl = decl_index }), em); return; }, diff --git a/src/link/Wasm/ZigObject.zig b/src/link/Wasm/ZigObject.zig index f74705e17c..993e1309c3 100644 --- a/src/link/Wasm/ZigObject.zig +++ b/src/link/Wasm/ZigObject.zig @@ -1051,7 +1051,7 @@ fn setupErrorsLen(zig_object: *ZigObject, wasm_file: *Wasm) !void { const gpa = wasm_file.base.comp.gpa; const sym_index = zig_object.findGlobalSymbol("__zig_errors_len") orelse return; - const errors_len = 1 + wasm_file.base.comp.module.?.intern_pool.global_error_set.mutate.list.len; + const errors_len = 1 + wasm_file.base.comp.module.?.intern_pool.global_error_set.getNamesFromMainThread().len; // overwrite existing atom if it already exists (maybe the error set has increased) // if not, allcoate a new atom. const atom_index = if (wasm_file.symbol_atom.get(.{ .file = zig_object.index, .index = sym_index })) |index| blk: { |