jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 23:52:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix regressions caused earlier in this branch

Browse Source
This commit is contained in:
Andrew Kelley 2020-03-10 18:54:24 -04:00
parent 18f1fef142
commit cd26d3b0bb
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/debug.zig
View File

@ -825,8 +825,15 @@ pub fn openElfDebugInfo(allocator: *mem.Allocator, elf_file_path: []const u8) !M
const shoff = hdr.e_shoff; const shoff = hdr.e_shoff;
const str_section_off = shoff + @as(u64, hdr.e_shentsize) * @as(u64, hdr.e_shstrndx); const str_section_off = shoff + @as(u64, hdr.e_shentsize) * @as(u64, hdr.e_shstrndx);
const header_strings = mapped_mem[str_section_off..str_section_off + hdr.e_shentsize]; const str_shdr = @ptrCast(
const shdrs = @ptrCast([*]const elf.Shdr, @alignCast(@alignOf(elf.Shdr), &mapped_mem[shoff]))[0..hdr.e_shnum]; *const elf.Shdr,
@alignCast(@alignOf(elf.Shdr), &mapped_mem[str_section_off]),
);
const header_strings = mapped_mem[str_shdr.sh_offset .. str_shdr.sh_offset + str_shdr.sh_size];
const shdrs = @ptrCast(
[*]const elf.Shdr,
@alignCast(@alignOf(elf.Shdr), &mapped_mem[shoff]),
)[0..hdr.e_shnum];
var opt_debug_info: ?[]const u8 = null; var opt_debug_info: ?[]const u8 = null;
var opt_debug_abbrev: ?[]const u8 = null; var opt_debug_abbrev: ?[]const u8 = null;

3
lib/std/io/fixed_buffer_stream.zig
View File

@ -164,6 +164,5 @@ test "FixedBufferStream input" {
testing.expect(read == 3); testing.expect(read == 3);
testing.expect(mem.eql(u8, dest[0..3], bytes[4..7])); testing.expect(mem.eql(u8, dest[0..3], bytes[4..7]));
read = try fbs.inStream().read(dest[0..4]); testing.expectError(error.EndOfStream, fbs.inStream().read(dest[0..4]));
testing.expect(read == 0);
} }