| author |  Jakub Konka <kubkon@jakubkonka.com> 2022-02-08 20:33:45+01:00 |
| committer | Jakub Konka <kubkon@jakubkonka.com> 2022-02-09 10:28:48+01:00 |
| log | e5ce87f1b198bfcb022e9ea91f2a9a58b1b75026 |
| tree | 19edf20a27751a4c96a2c5a63f9328de1923bd52 |
| parent | 4d1e5ef730630badf92a613cdc57a42d2321df12 |
stage2: handle decl ref to void types
Fixes behavior test 19142 files changed, 6 insertions(+), 15 deletions(-)
src- test
- behavior
- bugs
src/codegen.zig+6-11
| ... | @@ -487,19 +487,14 @@ fn lowerDeclRef( | ... | @@ -487,19 +487,14 @@ fn lowerDeclRef( |
| 487 | return Result{ .appended = {} }; | 487 | return Result{ .appended = {} }; |
| 488 | } | 488 | } |
| 489 | 489 | ||
| 490 | const target = bin_file.options.target; | ||
| 491 | const ptr_width = target.cpu.arch.ptrBitWidth(); | ||
| 490 | const is_fn_body = decl.ty.zigTypeTag() == .Fn; | 492 | const is_fn_body = decl.ty.zigTypeTag() == .Fn; |
| 491 | if (!is_fn_body and !decl.ty.hasRuntimeBits()) { | 493 | if (!is_fn_body and !decl.ty.hasRuntimeBits()) { |
| 492 | return Result{ | 494 | try code.writer().writeByteNTimes(0xaa, @divExact(ptr_width, 8)); |
| 493 | .fail = try ErrorMsg.create( | 495 | return Result{ .appended = {} }; |
| 494 | bin_file.allocator, | ||
| 495 | src_loc, | ||
| 496 | "TODO handle void types when lowering decl ref", | ||
| 497 | .{}, | ||
| 498 | ), | ||
| 499 | }; | ||
| 500 | } | 496 | } |
| 501 | 497 | ||
| 502 | if (decl.analysis != .complete) return error.AnalysisFail; | ||
| 503 | decl.markAlive(); | 498 | decl.markAlive(); |
| 504 | const vaddr = vaddr: { | 499 | const vaddr = vaddr: { |
| 505 | if (bin_file.cast(link.File.MachO)) |macho_file| { | 500 | if (bin_file.cast(link.File.MachO)) |macho_file| { |
| ... | @@ -510,8 +505,8 @@ fn lowerDeclRef( | ... | @@ -510,8 +505,8 @@ fn lowerDeclRef( |
| 510 | break :vaddr bin_file.getDeclVAddr(decl); | 505 | break :vaddr bin_file.getDeclVAddr(decl); |
| 511 | }; | 506 | }; |
| 512 | 507 | ||
| 513 | const endian = bin_file.options.target.cpu.arch.endian(); | 508 | const endian = target.cpu.arch.endian(); |
| 514 | switch (bin_file.options.target.cpu.arch.ptrBitWidth()) { | 509 | switch (ptr_width) { |
| 515 | 16 => mem.writeInt(u16, try code.addManyAsArray(2), @intCast(u16, vaddr), endian), | 510 | 16 => mem.writeInt(u16, try code.addManyAsArray(2), @intCast(u16, vaddr), endian), |
| 516 | 32 => mem.writeInt(u32, try code.addManyAsArray(4), @intCast(u32, vaddr), endian), | 511 | 32 => mem.writeInt(u32, try code.addManyAsArray(4), @intCast(u32, vaddr), endian), |
| 517 | 64 => mem.writeInt(u64, try code.addManyAsArray(8), vaddr, endian), | 512 | 64 => mem.writeInt(u64, try code.addManyAsArray(8), vaddr, endian), |
test/behavior/bugs/1914.zig-4
| ... | @@ -13,8 +13,6 @@ const a = A{ .b_list_pointer = &b_list }; | ... | @@ -13,8 +13,6 @@ const a = A{ .b_list_pointer = &b_list }; |
| 13 | 13 | ||
| 14 | test "segfault bug" { | 14 | test "segfault bug" { |
| 15 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO | 15 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO |
| 16 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; | ||
| 17 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; | ||
| 18 | const assert = std.debug.assert; | 16 | const assert = std.debug.assert; |
| 19 | const obj = B{ .a_pointer = &a }; | 17 | const obj = B{ .a_pointer = &a }; |
| 20 | assert(obj.a_pointer == &a); // this makes zig crash | 18 | assert(obj.a_pointer == &a); // this makes zig crash |
| ... | @@ -31,8 +29,6 @@ pub const B2 = struct { | ... | @@ -31,8 +29,6 @@ pub const B2 = struct { |
| 31 | var b_value = B2{ .pointer_array = &[_]*A2{} }; | 29 | var b_value = B2{ .pointer_array = &[_]*A2{} }; |
| 32 | 30 | ||
| 33 | test "basic stuff" { | 31 | test "basic stuff" { |
| 34 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; | ||
| 35 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; | ||
| 36 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO | 32 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO |
| 37 | std.debug.assert(&b_value == &b_value); | 33 | std.debug.assert(&b_value == &b_value); |
| 38 | } | 34 | } |