authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-11-27 16:50:35+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-11-30 15:14:33+02:00
log63ae7899ae6803ba8113ed3176877c864ce889df
treec88732bd93fa84cd4e197d1bb32a9bb74d7551f2
parent71038c42f554da86ee23c9c448d39e457d5818eb

cbe: ensure test and tagName function names are unique


7 files changed, 7 insertions(+), 10 deletions(-)

src/codegen/c.zig+7-2
......@@ -1961,7 +1961,7 @@ pub const DeclGen = struct {
19611961 try buffer.appendSlice("static ");
19621962 try dg.renderType(bw, name_slice_ty, .Complete);
19631963 const name_begin = buffer.items.len + " ".len;
1964 try bw.print(" zig_tagName_{}(", .{typeToCIdentifier(enum_ty, dg.module)});
1964 try bw.print(" zig_tagName_{}_{d}(", .{ typeToCIdentifier(enum_ty, dg.module), @enumToInt(enum_ty.getOwnerDecl()) });
19651965 const name_end = buffer.items.len - "(".len;
19661966 try dg.renderTypeAndName(bw, enum_ty, .{ .identifier = "tag" }, .Const, 0, .Complete);
19671967 try buffer.appendSlice(") {\n switch (tag) {\n");
......@@ -2111,11 +2111,16 @@ pub const DeclGen = struct {
21112111 return writer.writeAll(exports.items[0].options.name);
21122112 } else if (decl.isExtern()) {
21132113 return writer.writeAll(mem.sliceTo(decl.name, 0));
2114 } else if (dg.module.test_functions.get(decl_index)) |_| {
2115 const gpa = dg.gpa;
2116 const name = try decl.getFullyQualifiedName(dg.module);
2117 defer gpa.free(name);
2118 return writer.print("{}_{d}", .{ fmtIdent(name), @enumToInt(decl_index) });
21142119 } else {
21152120 const gpa = dg.gpa;
21162121 const name = try decl.getFullyQualifiedName(dg.module);
21172122 defer gpa.free(name);
2118 return writer.print("{ }", .{fmtIdent(name)});
2123 return writer.print("{}", .{fmtIdent(name)});
21192124 }
21202125 }
21212126
test/behavior/basic.zig-1
......@@ -739,7 +739,6 @@ test "thread local variable" {
739739}
740740
741741test "result location is optional inside error union" {
742 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
743742 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
744743 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
745744
test/behavior/bugs/13064.zig-1
......@@ -5,7 +5,6 @@ const expect = std.testing.expect;
55test {
66 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
77 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
98
109 var x: [10][10]u32 = undefined;
1110
test/behavior/bugs/13065.zig-1
......@@ -10,7 +10,6 @@ const U = union(enum) {
1010test {
1111 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1212 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
13 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
1413
1514 var x = U{ .array = undefined };
1615
test/behavior/bugs/13069.zig-1
......@@ -6,7 +6,6 @@ test {
66 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
77 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
88 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
109
1110 var opt_x: ?[3]f32 = [_]f32{0.0} ** 3;
1211
test/behavior/enum.zig-1
......@@ -1101,7 +1101,6 @@ test "enum literal in array literal" {
11011101}
11021102
11031103test "tag name functions are unique" {
1104 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
11051104 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
11061105 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
11071106 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
test/behavior/math.zig-3
......@@ -315,8 +315,6 @@ test "comptime_int multi-limb partial shift right" {
315315}
316316
317317test "xor" {
318 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
319
320318 try test_xor();
321319 comptime try test_xor();
322320}
......@@ -572,7 +570,6 @@ fn testShrTrunc(x: u16) !void {
572570}
573571
574572test "f128" {
575 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
576573 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
577574 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
578575 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO