authorgravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-02-22 18:02:55+01:00
committergravatar for thatlemon@gmail.comLemonBoy <thatlemon@gmail.com> 2020-02-23 22:47:48+01:00
log08047cd6d710603a5391c9e88a7369f5dcfa196f
treee56f0f1a34d7ba351400c8588d3216f97855b33f
parent495e894225d3bb5695681be87ed0cd1b7f9825a2

correct test expectations

2 files changed, 21 insertions(+), 20 deletions(-)

lib/std/debug.zig+2-2
...@@ -493,7 +493,7 @@ fn populateModule(di: *ModuleDebugInfo, mod: *Module) !void {...@@ -493,7 +493,7 @@ fn populateModule(di: *ModuleDebugInfo, mod: *Module) !void {
493 sect_offset += @sizeOf(pdb.DebugSubsectionHeader);493 sect_offset += @sizeOf(pdb.DebugSubsectionHeader);
494494
495 switch (subsect_hdr.Kind) {495 switch (subsect_hdr.Kind) {
496 pdb.DebugSubsectionKind.FileChecksums => {496 .FileChecksums => {
497 mod.checksum_offset = sect_offset;497 mod.checksum_offset = sect_offset;
498 break;498 break;
499 },499 },
...@@ -1465,7 +1465,7 @@ pub const ModuleDebugInfo = switch (builtin.os) {...@@ -1465,7 +1465,7 @@ pub const ModuleDebugInfo = switch (builtin.os) {
1465 sect_offset += @sizeOf(pdb.DebugSubsectionHeader);1465 sect_offset += @sizeOf(pdb.DebugSubsectionHeader);
14661466
1467 switch (subsect_hdr.Kind) {1467 switch (subsect_hdr.Kind) {
1468 pdb.DebugSubsectionKind.Lines => {1468 .Lines => {
1469 var line_index = sect_offset;1469 var line_index = sect_offset;
14701470
1471 const line_hdr = @ptrCast(*pdb.LineFragmentHeader, &subsect_info[line_index]);1471 const line_hdr = @ptrCast(*pdb.LineFragmentHeader, &subsect_info[line_index]);
test/stack_traces.zig+19-18
...@@ -3,6 +3,7 @@ const std = @import("std");...@@ -3,6 +3,7 @@ const std = @import("std");
3const os = std.os;3const os = std.os;
4const tests = @import("tests.zig");4const tests = @import("tests.zig");
55
6// zig fmt: off
6pub fn addCases(cases: *tests.StackTracesContext) void {7pub fn addCases(cases: *tests.StackTracesContext) void {
7 const source_return =8 const source_return =
8 \\const std = @import("std");9 \\const std = @import("std");
...@@ -41,7 +42,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -41,7 +42,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
41 \\ try foo();42 \\ try foo();
42 \\}43 \\}
43 ;44 ;
44 // zig fmt: off45
45 switch (builtin.os) {46 switch (builtin.os) {
46 .freebsd => {47 .freebsd => {
47 cases.addCase(48 cases.addCase(
...@@ -264,14 +265,14 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -264,14 +265,14 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
264 [_][]const u8{265 [_][]const u8{
265 // debug266 // debug
266 \\error: TheSkyIsFalling267 \\error: TheSkyIsFalling
267 \\source.zig:4:5: [address] in _main.0 (test.o)268 \\source.zig:4:5: [address] in main (test)
268 \\ return error.TheSkyIsFalling;269 \\ return error.TheSkyIsFalling;
269 \\ ^270 \\ ^
270 \\271 \\
271 ,272 ,
272 // release-safe273 // release-safe
273 \\error: TheSkyIsFalling274 \\error: TheSkyIsFalling
274 \\source.zig:4:5: [address] in _main (test.o)275 \\source.zig:4:5: [address] in std.start.main (test)
275 \\ return error.TheSkyIsFalling;276 \\ return error.TheSkyIsFalling;
276 \\ ^277 \\ ^
277 \\278 \\
...@@ -291,20 +292,20 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -291,20 +292,20 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
291 [_][]const u8{292 [_][]const u8{
292 // debug293 // debug
293 \\error: TheSkyIsFalling294 \\error: TheSkyIsFalling
294 \\source.zig:4:5: [address] in _foo (test.o)295 \\source.zig:4:5: [address] in foo (test)
295 \\ return error.TheSkyIsFalling;296 \\ return error.TheSkyIsFalling;
296 \\ ^297 \\ ^
297 \\source.zig:8:5: [address] in _main.0 (test.o)298 \\source.zig:8:5: [address] in main (test)
298 \\ try foo();299 \\ try foo();
299 \\ ^300 \\ ^
300 \\301 \\
301 ,302 ,
302 // release-safe303 // release-safe
303 \\error: TheSkyIsFalling304 \\error: TheSkyIsFalling
304 \\source.zig:4:5: [address] in _main (test.o)305 \\source.zig:4:5: [address] in std.start.main (test)
305 \\ return error.TheSkyIsFalling;306 \\ return error.TheSkyIsFalling;
306 \\ ^307 \\ ^
307 \\source.zig:8:5: [address] in _main (test.o)308 \\source.zig:8:5: [address] in std.start.main (test)
308 \\ try foo();309 \\ try foo();
309 \\ ^310 \\ ^
310 \\311 \\
...@@ -324,32 +325,32 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -324,32 +325,32 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
324 [_][]const u8{325 [_][]const u8{
325 // debug326 // debug
326 \\error: TheSkyIsFalling327 \\error: TheSkyIsFalling
327 \\source.zig:12:5: [address] in _make_error (test.o)328 \\source.zig:12:5: [address] in make_error (test)
328 \\ return error.TheSkyIsFalling;329 \\ return error.TheSkyIsFalling;
329 \\ ^330 \\ ^
330 \\source.zig:8:5: [address] in _bar (test.o)331 \\source.zig:8:5: [address] in bar (test)
331 \\ return make_error();332 \\ return make_error();
332 \\ ^333 \\ ^
333 \\source.zig:4:5: [address] in _foo (test.o)334 \\source.zig:4:5: [address] in foo (test)
334 \\ try bar();335 \\ try bar();
335 \\ ^336 \\ ^
336 \\source.zig:16:5: [address] in _main.0 (test.o)337 \\source.zig:16:5: [address] in main (test)
337 \\ try foo();338 \\ try foo();
338 \\ ^339 \\ ^
339 \\340 \\
340 ,341 ,
341 // release-safe342 // release-safe
342 \\error: TheSkyIsFalling343 \\error: TheSkyIsFalling
343 \\source.zig:12:5: [address] in _main (test.o)344 \\source.zig:12:5: [address] in std.start.main (test)
344 \\ return error.TheSkyIsFalling;345 \\ return error.TheSkyIsFalling;
345 \\ ^346 \\ ^
346 \\source.zig:8:5: [address] in _main (test.o)347 \\source.zig:8:5: [address] in std.start.main (test)
347 \\ return make_error();348 \\ return make_error();
348 \\ ^349 \\ ^
349 \\source.zig:4:5: [address] in _main (test.o)350 \\source.zig:4:5: [address] in std.start.main (test)
350 \\ try bar();351 \\ try bar();
351 \\ ^352 \\ ^
352 \\source.zig:16:5: [address] in _main (test.o)353 \\source.zig:16:5: [address] in std.start.main (test)
353 \\ try foo();354 \\ try foo();
354 \\ ^355 \\ ^
355 \\356 \\
...@@ -393,7 +394,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -393,7 +394,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
393 source_try_return,394 source_try_return,
394 [_][]const u8{395 [_][]const u8{
395 // debug396 // debug
396 \\error: TheSkyIsFalling397 \\error: TheSkyIsFalling
397 \\source.zig:4:5: [address] in foo (test.obj)398 \\source.zig:4:5: [address] in foo (test.obj)
398 \\ return error.TheSkyIsFalling;399 \\ return error.TheSkyIsFalling;
399 \\ ^400 \\ ^
...@@ -419,7 +420,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -419,7 +420,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
419 source_try_try_return_return,420 source_try_try_return_return,
420 [_][]const u8{421 [_][]const u8{
421 // debug422 // debug
422 \\error: TheSkyIsFalling423 \\error: TheSkyIsFalling
423 \\source.zig:12:5: [address] in make_error (test.obj)424 \\source.zig:12:5: [address] in make_error (test.obj)
424 \\ return error.TheSkyIsFalling;425 \\ return error.TheSkyIsFalling;
425 \\ ^426 \\ ^
...@@ -449,5 +450,5 @@ pub fn addCases(cases: *tests.StackTracesContext) void {...@@ -449,5 +450,5 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
449 },450 },
450 else => {},451 else => {},
451 }452 }
452 // zig fmt: off
453}453}
454// zig fmt: off