Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-02-02 20:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

make gpa.deinit work with stage2

Browse Source
This commit is contained in:
Veikka Tuominen 2022-02-28 10:20:29 +02:00 committed by Andrew Kelley
parent dfeffcfbf8
commit 2682b41da5
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/hash_map.zig
View File

@ -738,7 +738,7 @@ pub fn HashMapUnmanaged(
value: V, value: V,
}; };
const Header = packed struct { const Header = struct {
values: [*]V, values: [*]V,
keys: [*]K, keys: [*]K,
capacity: Size, capacity: Size,
@ -932,7 +932,7 @@ pub fn HashMapUnmanaged(
} }
fn header(self: *const Self) *Header { fn header(self: *const Self) *Header {
return @ptrCast(*Header, @ptrCast([*]Header, self.metadata.?) - 1); return @ptrCast(*Header, @ptrCast([*]Header, @alignCast(@alignOf(Header), self.metadata.?)) - 1);
} }
fn keys(self: *const Self) [*]K { fn keys(self: *const Self) [*]K {

25
lib/std/heap/general_purpose_allocator.zig
View File

@ -341,9 +341,15 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
const slot_index = @intCast(SlotIndex, used_bits_byte * 8 + bit_index); const slot_index = @intCast(SlotIndex, used_bits_byte * 8 + bit_index);
const stack_trace = bucketStackTrace(bucket, size_class, slot_index, .alloc); const stack_trace = bucketStackTrace(bucket, size_class, slot_index, .alloc);
const addr = bucket.page + slot_index * size_class; const addr = bucket.page + slot_index * size_class;
log.err("memory address 0x{x} leaked: {s}", .{ if (builtin.zig_backend == .stage1) {
@ptrToInt(addr), stack_trace, log.err("memory address 0x{x} leaked: {s}", .{
}); @ptrToInt(addr), stack_trace,
});
} else { // TODO
log.err("memory address 0x{x} leaked", .{
@ptrToInt(addr),
});
}
leaks = true; leaks = true;
} }
if (bit_index == math.maxInt(u3)) if (bit_index == math.maxInt(u3))
@ -372,9 +378,16 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
var it = self.large_allocations.valueIterator(); var it = self.large_allocations.valueIterator();
while (it.next()) |large_alloc| { while (it.next()) |large_alloc| {
if (config.retain_metadata and large_alloc.freed) continue; if (config.retain_metadata and large_alloc.freed) continue;
log.err("memory address 0x{x} leaked: {s}", .{ const stack_trace = large_alloc.getStackTrace(.alloc);
@ptrToInt(large_alloc.bytes.ptr), large_alloc.getStackTrace(.alloc), if (builtin.zig_backend == .stage1) {
}); log.err("memory address 0x{x} leaked: {s}", .{
@ptrToInt(large_alloc.bytes.ptr), stack_trace,
});
} else { // TODO
log.err("memory address 0x{x} leaked", .{
@ptrToInt(large_alloc.bytes.ptr),
});
}
leaks = true; leaks = true;
} }
return leaks; return leaks;

5
lib/std/special/test_runner.zig
View File

@ -46,9 +46,10 @@ pub fn main() void {
var leaks: usize = 0; var leaks: usize = 0;
for (test_fn_list) |test_fn, i| { for (test_fn_list) |test_fn, i| {
if (builtin.zig_backend != .stage2_llvm) std.testing.allocator_instance = .{}; const gpa_works = builtin.zig_backend == .stage1 or builtin.os.tag != .macos;
if (gpa_works) std.testing.allocator_instance = .{};
defer { defer {
if (builtin.zig_backend != .stage2_llvm and std.testing.allocator_instance.deinit()) { if (gpa_works and std.testing.allocator_instance.deinit()) {
leaks += 1; leaks += 1;
} }
} }