diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2019-09-04 14:39:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-04 14:39:36 -0400 |
| commit | 090f2ffb820ab10773322636d3c940bbfd6028be (patch) | |
| tree | 7a36bef3a48854cb08cb9bbc6a727212f0ff7858 /std/debug.zig | |
| parent | e540e5b8ec1d90b86d6f41814507e6ae4ae5edd8 (diff) | |
| parent | df06976e73e37a36009fb5f43c2310ad610a4a2e (diff) | |
| download | zig-090f2ffb820ab10773322636d3c940bbfd6028be.tar.gz zig-090f2ffb820ab10773322636d3c940bbfd6028be.zip | |
Merge pull request #3152 from Snektron/arm-support-improvement
Arm support improvement (part 1)
Diffstat (limited to 'std/debug.zig')
| -rw-r--r-- | std/debug.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/std/debug.zig b/std/debug.zig index d1c17343ef..68e6220a72 100644 --- a/std/debug.zig +++ b/std/debug.zig @@ -793,7 +793,7 @@ fn printLineInfo( try out_stream.write(GREEN ++ "^" ++ RESET ++ "\n"); } } else |err| switch (err) { - error.EndOfFile => {}, + error.EndOfFile, error.FileNotFound => {}, else => return err, } } else { @@ -1053,7 +1053,8 @@ fn openSelfDebugInfoPosix(allocator: *mem.Allocator) !DwarfInfo { S.self_exe_file = try fs.openSelfExe(); errdefer S.self_exe_file.close(); - const self_exe_mmap_len = mem.alignForward(try S.self_exe_file.getEndPos(), mem.page_size); + const self_exe_len = math.cast(usize, try S.self_exe_file.getEndPos()) catch return error.DebugInfoTooLarge; + const self_exe_mmap_len = mem.alignForward(self_exe_len, mem.page_size); const self_exe_mmap = try os.mmap( null, self_exe_mmap_len, |