| author | |
| committer | |
| log | 4c3877069dbf3476b15cea9258d164bda26e8385 |
| tree | 8cff4cd0055737160f9d0ad671b9360db83d1d01 |
| parent | 83c7aba12780333a832148684d055698a2914463 |
Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31567
Reviewed-by: Andrew Kelley <andrew@ziglang.org>
Co-authored-by: squidy239 <sachabarsayuracko@gmail.com>
Co-committed-by: squidy239 <sachabarsayuracko@gmail.com>11 files changed, 10 insertions(+), 36 deletions(-)
lib/compiler_rt/log.zig+1-2| ... | @@ -420,8 +420,7 @@ pub fn log(x: f64) callconv(.c) f64 { | ... | @@ -420,8 +420,7 @@ pub fn log(x: f64) callconv(.c) f64 { |
| 420 | // maybe use fma as musl does | 420 | // maybe use fma as musl does |
| 421 | const r = (z - tab2[i].chi - tab2[i].clo) * invc; | 421 | const r = (z - tab2[i].chi - tab2[i].clo) * invc; |
| 422 | 422 | ||
| 423 | // https://github.com/ziglang/zig/issues/18614 | 423 | const kd: f64 = k; |
| 424 | const kd: f64 = @floatFromInt(k); | ||
| 425 | const w = kd * 0x1.62e42fefa3800p-1 + logc; | 424 | const w = kd * 0x1.62e42fefa3800p-1 + logc; |
| 426 | const hi = w + r; | 425 | const hi = w + r; |
| 427 | const lo = w - hi + r + kd * 0x1.ef35793c76730p-45; | 426 | const lo = w - hi + r + kd * 0x1.ef35793c76730p-45; |
lib/std/Io/Threaded/test.zig+2-12| ... | @@ -9,11 +9,6 @@ const assert = std.debug.assert; | ... | @@ -9,11 +9,6 @@ const assert = std.debug.assert; |
| 9 | const windows = std.os.windows; | 9 | const windows = std.os.windows; |
| 10 | 10 | ||
| 11 | test "concurrent vs main prevents deadlock via oversubscription" { | 11 | test "concurrent vs main prevents deadlock via oversubscription" { |
| 12 | if (true) { | ||
| 13 | // https://codeberg.org/ziglang/zig/issues/30141 | ||
| 14 | return error.SkipZigTest; | ||
| 15 | } | ||
| 16 | |||
| 17 | var threaded: Io.Threaded = .init(std.testing.allocator, .{ | 12 | var threaded: Io.Threaded = .init(std.testing.allocator, .{ |
| 18 | .argv0 = .empty, | 13 | .argv0 = .empty, |
| 19 | .environ = .empty, | 14 | .environ = .empty, |
| ... | @@ -37,19 +32,14 @@ test "concurrent vs main prevents deadlock via oversubscription" { | ... | @@ -37,19 +32,14 @@ test "concurrent vs main prevents deadlock via oversubscription" { |
| 37 | } | 32 | } |
| 38 | 33 | ||
| 39 | fn put(io: Io, queue: *Io.Queue(u8)) void { | 34 | fn put(io: Io, queue: *Io.Queue(u8)) void { |
| 40 | queue.putOneUncancelable(io, 42); | 35 | queue.putOneUncancelable(io, 42) catch unreachable; |
| 41 | } | 36 | } |
| 42 | 37 | ||
| 43 | fn get(io: Io, queue: *Io.Queue(u8)) void { | 38 | fn get(io: Io, queue: *Io.Queue(u8)) void { |
| 44 | assert(queue.getOneUncancelable(io) == 42); | 39 | assert(queue.getOneUncancelable(io) catch unreachable == 42); |
| 45 | } | 40 | } |
| 46 | 41 | ||
| 47 | test "concurrent vs concurrent prevents deadlock via oversubscription" { | 42 | test "concurrent vs concurrent prevents deadlock via oversubscription" { |
| 48 | if (true) { | ||
| 49 | // https://codeberg.org/ziglang/zig/issues/30141 | ||
| 50 | return error.SkipZigTest; | ||
| 51 | } | ||
| 52 | |||
| 53 | var threaded: Io.Threaded = .init(std.testing.allocator, .{ | 43 | var threaded: Io.Threaded = .init(std.testing.allocator, .{ |
| 54 | .argv0 = .empty, | 44 | .argv0 = .empty, |
| 55 | .environ = .empty, | 45 | .environ = .empty, |
lib/std/heap.zig+1-4| ... | @@ -45,10 +45,7 @@ pub const MemoryPoolOptions = memory_pool.Options; | ... | @@ -45,10 +45,7 @@ pub const MemoryPoolOptions = memory_pool.Options; |
| 45 | /// | 45 | /// |
| 46 | /// On many systems, the actual page size can only be determined at runtime | 46 | /// On many systems, the actual page size can only be determined at runtime |
| 47 | /// with `pageSize`. | 47 | /// with `pageSize`. |
| 48 | pub const page_size_min: usize = std.options.page_size_min orelse (page_size_min_default orelse 1); | 48 | pub const page_size_min: usize = std.options.page_size_min orelse (page_size_min_default orelse @compileError(@tagName(builtin.cpu.arch) ++ "-" ++ @tagName(builtin.os.tag) ++ " has unknown page_size_min; populate std.options.page_size_min")); |
| 49 | //`orelse 1` is a workaround for https://codeberg.org/ziglang/zig/issues/30842 | ||
| 50 | //@compileError(@tagName(builtin.cpu.arch) ++ "-" ++ @tagName(builtin.os.tag) ++ " has unknown page_size_min; populate std.options.page_size_min")); | ||
| 51 | |||
| 52 | /// comptime-known maximum page size of the target. | 49 | /// comptime-known maximum page size of the target. |
| 53 | /// | 50 | /// |
| 54 | /// Targeting a system with a larger page size may require overriding | 51 | /// Targeting a system with a larger page size may require overriding |
lib/std/meta.zig+1-2| ... | @@ -482,8 +482,7 @@ pub fn FieldEnum(comptime T: type) type { | ... | @@ -482,8 +482,7 @@ pub fn FieldEnum(comptime T: type) type { |
| 482 | } | 482 | } |
| 483 | 483 | ||
| 484 | fn expectEqualEnum(expected: anytype, actual: @TypeOf(expected)) !void { | 484 | fn expectEqualEnum(expected: anytype, actual: @TypeOf(expected)) !void { |
| 485 | // TODO: https://github.com/ziglang/zig/issues/7419 | 485 | try testing.expectEqual(@typeInfo(expected).@"enum", @typeInfo(actual).@"enum"); |
| 486 | // testing.expectEqual(@typeInfo(expected).@"enum", @typeInfo(actual).@"enum"); | ||
| 487 | try testing.expectEqual( | 486 | try testing.expectEqual( |
| 488 | @typeInfo(expected).@"enum".tag_type, | 487 | @typeInfo(expected).@"enum".tag_type, |
| 489 | @typeInfo(actual).@"enum".tag_type, | 488 | @typeInfo(actual).@"enum".tag_type, |
src/link/Elf/Object.zig+1-2| ... | @@ -736,8 +736,7 @@ pub fn markImportsExports(self: *Object, elf_file: *Elf) void { | ... | @@ -736,8 +736,7 @@ pub fn markImportsExports(self: *Object, elf_file: *Elf) void { |
| 736 | const ref = self.resolveSymbol(@intCast(idx), elf_file); | 736 | const ref = self.resolveSymbol(@intCast(idx), elf_file); |
| 737 | const sym = elf_file.symbol(ref) orelse continue; | 737 | const sym = elf_file.symbol(ref) orelse continue; |
| 738 | const file = sym.file(elf_file).?; | 738 | const file = sym.file(elf_file).?; |
| 739 | // https://github.com/ziglang/zig/issues/21678 | 739 | if (sym.version_index == elf.Versym.LOCAL) continue; |
| 740 | if (@as(u16, @bitCast(sym.version_index)) == @as(u16, @bitCast(elf.Versym.LOCAL))) continue; | ||
| 741 | const vis: elf.STV = @enumFromInt(@as(u3, @truncate(sym.elfSym(elf_file).st_other))); | 740 | const vis: elf.STV = @enumFromInt(@as(u3, @truncate(sym.elfSym(elf_file).st_other))); |
| 742 | if (vis == .HIDDEN) continue; | 741 | if (vis == .HIDDEN) continue; |
| 743 | if (file == .shared_object and !sym.isAbs(elf_file)) { | 742 | if (file == .shared_object and !sym.isAbs(elf_file)) { |
src/link/Elf/SharedObject.zig+1-3| ... | @@ -281,9 +281,7 @@ pub fn parse( | ... | @@ -281,9 +281,7 @@ pub fn parse( |
| 281 | else | 281 | else |
| 282 | .{ .VERSION = versyms[i].VERSION, .HIDDEN = false }; | 282 | .{ .VERSION = versyms[i].VERSION, .HIDDEN = false }; |
| 283 | 283 | ||
| 284 | // https://github.com/ziglang/zig/issues/21678 | 284 | if (ver == elf.Versym.LOCAL) continue; |
| 285 | //if (ver == .LOCAL) continue; | ||
| 286 | if (@as(u16, @bitCast(ver)) == 0) continue; | ||
| 287 | 285 | ||
| 288 | try nonlocal_esyms.ensureUnusedCapacity(gpa, 1); | 286 | try nonlocal_esyms.ensureUnusedCapacity(gpa, 1); |
| 289 | try nonlocal_versyms.ensureUnusedCapacity(gpa, 1); | 287 | try nonlocal_versyms.ensureUnusedCapacity(gpa, 1); |
src/link/Elf/ZigObject.zig+1-2| ... | @@ -693,8 +693,7 @@ pub fn markImportsExports(self: *ZigObject, elf_file: *Elf) void { | ... | @@ -693,8 +693,7 @@ pub fn markImportsExports(self: *ZigObject, elf_file: *Elf) void { |
| 693 | const ref = self.resolveSymbol(@intCast(i | global_symbol_bit), elf_file); | 693 | const ref = self.resolveSymbol(@intCast(i | global_symbol_bit), elf_file); |
| 694 | const sym = elf_file.symbol(ref) orelse continue; | 694 | const sym = elf_file.symbol(ref) orelse continue; |
| 695 | const file = sym.file(elf_file).?; | 695 | const file = sym.file(elf_file).?; |
| 696 | // https://github.com/ziglang/zig/issues/21678 | 696 | if (sym.version_index == elf.Versym.LOCAL) continue; |
| 697 | if (@as(u16, @bitCast(sym.version_index)) == @as(u16, @bitCast(elf.Versym.LOCAL))) continue; | ||
| 698 | const vis: elf.STV = @enumFromInt(@as(u3, @truncate(sym.elfSym(elf_file).st_other))); | 697 | const vis: elf.STV = @enumFromInt(@as(u3, @truncate(sym.elfSym(elf_file).st_other))); |
| 699 | if (vis == .HIDDEN) continue; | 698 | if (vis == .HIDDEN) continue; |
| 700 | if (file == .shared_object and !sym.isAbs(elf_file)) { | 699 | if (file == .shared_object and !sym.isAbs(elf_file)) { |
src/link/Elf/synthetic_sections.zig+1-2| ... | @@ -1372,8 +1372,7 @@ pub const VerneedSection = struct { | ... | @@ -1372,8 +1372,7 @@ pub const VerneedSection = struct { |
| 1372 | 1372 | ||
| 1373 | for (verneed.items[1..]) |ver| { | 1373 | for (verneed.items[1..]) |ver| { |
| 1374 | if (ver.shared_object == last.shared_object) { | 1374 | if (ver.shared_object == last.shared_object) { |
| 1375 | // https://github.com/ziglang/zig/issues/21678 | 1375 | if (ver.version_index != last.version_index) { |
| 1376 | if (@as(u16, @bitCast(ver.version_index)) != @as(u16, @bitCast(last.version_index))) { | ||
| 1377 | last_vernaux = try vern.addVernaux(last_verneed, ver.versionString(elf_file), elf_file); | 1376 | last_vernaux = try vern.addVernaux(last_verneed, ver.versionString(elf_file), elf_file); |
| 1378 | } | 1377 | } |
| 1379 | } else { | 1378 | } else { |
test/behavior/atomics.zig-5| ... | @@ -217,11 +217,6 @@ test "atomicrmw with ints" { | ... | @@ -217,11 +217,6 @@ test "atomicrmw with ints" { |
| 217 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; | 217 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; |
| 218 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; | 218 | if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; |
| 219 | 219 | ||
| 220 | if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isMIPS()) { | ||
| 221 | // https://github.com/ziglang/zig/issues/16846 | ||
| 222 | return error.SkipZigTest; | ||
| 223 | } | ||
| 224 | |||
| 225 | try testAtomicRmwInts(); | 220 | try testAtomicRmwInts(); |
| 226 | try comptime testAtomicRmwInts(); | 221 | try comptime testAtomicRmwInts(); |
| 227 | } | 222 | } |
test/behavior/prefetch.zig-1| ... | @@ -3,7 +3,6 @@ const std = @import("std"); | ... | @@ -3,7 +3,6 @@ const std = @import("std"); |
| 3 | 3 | ||
| 4 | test "@prefetch()" { | 4 | test "@prefetch()" { |
| 5 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; | 5 | if (builtin.zig_backend == .stage2_spirv) return error.SkipZigTest; |
| 6 | if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch.isLoongArch()) return error.SkipZigTest; // https://github.com/llvm/llvm-project/issues/134624 | ||
| 7 | 6 | ||
| 8 | var a: [2]u32 = .{ 42, 42 }; | 7 | var a: [2]u32 = .{ 42, 42 }; |
| 9 | var a_len = a.len; | 8 | var a_len = a.len; |
test/link/elf.zig+1-1| ... | @@ -74,7 +74,7 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step { | ... | @@ -74,7 +74,7 @@ pub fn testAll(b: *Build, build_opts: BuildOptions) *Step { |
| 74 | elf_step.dependOn(testImageBase(b, .{ .target = musl_target })); | 74 | elf_step.dependOn(testImageBase(b, .{ .target = musl_target })); |
| 75 | elf_step.dependOn(testInitArrayOrder(b, .{ .target = musl_target })); | 75 | elf_step.dependOn(testInitArrayOrder(b, .{ .target = musl_target })); |
| 76 | elf_step.dependOn(testLargeAlignmentExe(b, .{ .target = musl_target })); | 76 | elf_step.dependOn(testLargeAlignmentExe(b, .{ .target = musl_target })); |
| 77 | // https://github.com/ziglang/zig/issues/17449 | 77 | // https://codeberg.org/ziglang/zig/issues/31580 |
| 78 | // elf_step.dependOn(testLargeBss(b, .{ .target = musl_target })); | 78 | // elf_step.dependOn(testLargeBss(b, .{ .target = musl_target })); |
| 79 | elf_step.dependOn(testLinkingC(b, .{ .target = musl_target })); | 79 | elf_step.dependOn(testLinkingC(b, .{ .target = musl_target })); |
| 80 | elf_step.dependOn(testLinkingCpp(b, .{ .target = musl_target })); | 80 | elf_step.dependOn(testLinkingCpp(b, .{ .target = musl_target })); |