| author |  Daniele Cocca <daniele.cocca@gmail.com> 2021-11-13 02:44:16+00:00 |
| committer |  Andrew Kelley <andrew@ziglang.org> 2021-11-14 22:49:50-05:00 |
| log | 29f531bec9fd8cedc0e0da0981d1a71bb3348641 |
| tree | 4206ee60cdc1be5a58d4fd38d3a70567e050a174 |
| parent | c61fbe77c8689709aac4adfa78b27ed7ea53ee5f |
CBE: memset(..., 0xaa, ...) undefined values
This commit makes airStore() handle undefined values directly instead of
delegating to renderValue(): the call to renderValue() happens too late,
when "dest = " has already been written to the stream, at which point
there's no sane way to initialize e.g. struct values by assignment.
Instead, we make airStore() use memset(dest, 0xaa, sizeof(dest)), which
should transparently handle all types.
Also moves the newly-passing tests to the top of test/behavior.zig.2 files changed, 45 insertions(+), 6 deletions(-)
src- codegen
- test
src/codegen/c.zig+39
| ... | ... | @@ -1470,12 +1470,51 @@ fn airBoolToInt(f: *Function, inst: Air.Inst.Index) !CValue { |
| 1470 | 1470 | return local; |
| 1471 | 1471 | } |
| 1472 | 1472 | |
| 1473 | fn airStoreUndefined(f: *Function, dest_ptr: CValue) !CValue { | |
| 1474 | const is_debug_build = f.object.dg.module.optimizeMode() == .Debug; | |
| 1475 | if (!is_debug_build) | |
| 1476 | return CValue.none; | |
| 1477 | ||
| 1478 | const writer = f.object.writer(); | |
| 1479 | switch (dest_ptr) { | |
| 1480 | .local_ref => |i| { | |
| 1481 | const dest: CValue = .{ .local = i }; | |
| 1482 | try writer.writeAll("memset(&"); | |
| 1483 | try f.writeCValue(writer, dest); | |
| 1484 | try writer.writeAll(", 0xaa, sizeof("); | |
| 1485 | try f.writeCValue(writer, dest); | |
| 1486 | try writer.writeAll("));\n"); | |
| 1487 | }, | |
| 1488 | .decl_ref => |decl| { | |
| 1489 | const dest: CValue = .{ .decl = decl }; | |
| 1490 | try writer.writeAll("memset(&"); | |
| 1491 | try f.writeCValue(writer, dest); | |
| 1492 | try writer.writeAll(", 0xaa, sizeof("); | |
| 1493 | try f.writeCValue(writer, dest); | |
| 1494 | try writer.writeAll("));\n"); | |
| 1495 | }, | |
| 1496 | else => { | |
| 1497 | try writer.writeAll("memset("); | |
| 1498 | try f.writeCValue(writer, dest_ptr); | |
| 1499 | try writer.writeAll(", 0xaa, sizeof(*"); | |
| 1500 | try f.writeCValue(writer, dest_ptr); | |
| 1501 | try writer.writeAll("));\n"); | |
| 1502 | }, | |
| 1503 | } | |
| 1504 | return CValue.none; | |
| 1505 | } | |
| 1506 | ||
| 1473 | 1507 | fn airStore(f: *Function, inst: Air.Inst.Index) !CValue { |
| 1474 | 1508 | // *a = b; |
| 1475 | 1509 | const bin_op = f.air.instructions.items(.data)[inst].bin_op; |
| 1476 | 1510 | const dest_ptr = try f.resolveInst(bin_op.lhs); |
| 1477 | 1511 | const src_val = try f.resolveInst(bin_op.rhs); |
| 1478 | 1512 | |
| 1513 | const src_val_is_undefined = | |
| 1514 | if (f.air.value(bin_op.rhs)) |v| v.isUndef() else false; | |
| 1515 | if (src_val_is_undefined) | |
| 1516 | return try airStoreUndefined(f, dest_ptr); | |
| 1517 | ||
| 1479 | 1518 | const writer = f.object.writer(); |
| 1480 | 1519 | switch (dest_ptr) { |
| 1481 | 1520 | .local_ref => |i| { |
test/behavior.zig+6-6
| ... | ... | @@ -5,12 +5,15 @@ test { |
| 5 | 5 | _ = @import("behavior/basic.zig"); |
| 6 | 6 | _ = @import("behavior/bitcast.zig"); |
| 7 | 7 | _ = @import("behavior/bool.zig"); |
| 8 | _ = @import("behavior/bugs/624.zig"); | |
| 8 | 9 | _ = @import("behavior/bugs/655.zig"); |
| 9 | 10 | _ = @import("behavior/bugs/679.zig"); |
| 10 | 11 | _ = @import("behavior/bugs/704.zig"); |
| 11 | 12 | _ = @import("behavior/bugs/1486.zig"); |
| 12 | 13 | _ = @import("behavior/bugs/2346.zig"); |
| 14 | _ = @import("behavior/bugs/2692.zig"); | |
| 13 | 15 | _ = @import("behavior/bugs/2889.zig"); |
| 16 | _ = @import("behavior/bugs/3586.zig"); | |
| 14 | 17 | _ = @import("behavior/bugs/4560.zig"); |
| 15 | 18 | _ = @import("behavior/bugs/4769_a.zig"); |
| 16 | 19 | _ = @import("behavior/bugs/4769_b.zig"); |
| ... | ... | @@ -30,6 +33,9 @@ test { |
| 30 | 33 | _ = @import("behavior/underscore.zig"); |
| 31 | 34 | _ = @import("behavior/usingnamespace.zig"); |
| 32 | 35 | _ = @import("behavior/while.zig"); |
| 36 | _ = @import("behavior/this.zig"); | |
| 37 | _ = @import("behavior/member_func.zig"); | |
| 38 | _ = @import("behavior/translate_c_macros.zig"); | |
| 33 | 39 | |
| 34 | 40 | if (builtin.object_format != .c) { |
| 35 | 41 | // Tests that pass for stage1 and stage2 but not the C backend. |
| ... | ... | @@ -38,14 +44,11 @@ test { |
| 38 | 44 | _ = @import("behavior/atomics.zig"); |
| 39 | 45 | _ = @import("behavior/basic_llvm.zig"); |
| 40 | 46 | _ = @import("behavior/bugs/394.zig"); |
| 41 | _ = @import("behavior/bugs/624.zig"); | |
| 42 | 47 | _ = @import("behavior/bugs/1277.zig"); |
| 43 | 48 | _ = @import("behavior/bugs/1500.zig"); |
| 44 | 49 | _ = @import("behavior/bugs/1741.zig"); |
| 45 | 50 | _ = @import("behavior/bugs/2006.zig"); |
| 46 | _ = @import("behavior/bugs/2692.zig"); | |
| 47 | 51 | _ = @import("behavior/bugs/3112.zig"); |
| 48 | _ = @import("behavior/bugs/3586.zig"); | |
| 49 | 52 | _ = @import("behavior/cast.zig"); |
| 50 | 53 | _ = @import("behavior/error.zig"); |
| 51 | 54 | _ = @import("behavior/eval.zig"); |
| ... | ... | @@ -55,7 +58,6 @@ test { |
| 55 | 58 | _ = @import("behavior/generics.zig"); |
| 56 | 59 | _ = @import("behavior/math.zig"); |
| 57 | 60 | _ = @import("behavior/maximum_minimum.zig"); |
| 58 | _ = @import("behavior/member_func.zig"); | |
| 59 | 61 | _ = @import("behavior/null_llvm.zig"); |
| 60 | 62 | _ = @import("behavior/optional.zig"); |
| 61 | 63 | _ = @import("behavior/pointers.zig"); |
| ... | ... | @@ -65,8 +67,6 @@ test { |
| 65 | 67 | _ = @import("behavior/slice.zig"); |
| 66 | 68 | _ = @import("behavior/struct_llvm.zig"); |
| 67 | 69 | _ = @import("behavior/switch.zig"); |
| 68 | _ = @import("behavior/this.zig"); | |
| 69 | _ = @import("behavior/translate_c_macros.zig"); | |
| 70 | 70 | _ = @import("behavior/union.zig"); |
| 71 | 71 | _ = @import("behavior/widening.zig"); |
| 72 | 72 |