authorgravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-09-26 17:40:31-06:00
committergravatar for me@tadeo.caTadeo Kondrak <me@tadeo.ca> 2020-10-01 15:06:21-06:00
loge187ac09cbc23fedef40014f520b2e905033746b
tree80f33fbb95425757198ed920bbbaf9973ddf0b30
parenta12203d2be2ff1021d8faa9b87c53af091f0bd01
signature Commit is signed but in an unrecognized format.

Update compile error tests for alignment in StructField/UnionField

1 files changed, 51 insertions(+), 52 deletions(-)

test/compile_errors.zig+51-52
......@@ -38,20 +38,39 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
3838 "tmp.zig:2:20: error: TypeInfo.Enum.tag_type must be an integer type, not 'bool'",
3939 });
4040
41 cases.add("slice sentinel mismatch",
42 \\export fn entry() void {
43 \\ const x = @import("std").meta.Vector(3, f32){ 25, 75, 5, 0 };
44 \\}
45 , &[_][]const u8{
46 "tmp.zig:2:62: error: index 3 outside vector of size 3",
47 });
48
49 cases.add("slice sentinel mismatch",
41 cases.add("@Type for tagged union with extra enum field",
42 \\const TypeInfo = @import("builtin").TypeInfo;
43 \\const Tag = @Type(.{
44 \\ .Enum = .{
45 \\ .layout = .Auto,
46 \\ .tag_type = u2,
47 \\ .fields = &[_]TypeInfo.EnumField{
48 \\ .{ .name = "signed", .value = 0 },
49 \\ .{ .name = "unsigned", .value = 1 },
50 \\ .{ .name = "arst", .value = 2 },
51 \\ },
52 \\ .decls = &[_]TypeInfo.Declaration{},
53 \\ .is_exhaustive = true,
54 \\ },
55 \\});
56 \\const Tagged = @Type(.{
57 \\ .Union = .{
58 \\ .layout = .Auto,
59 \\ .tag_type = Tag,
60 \\ .fields = &[_]TypeInfo.UnionField{
61 \\ .{ .name = "signed", .field_type = i32, .alignment = @alignOf(i32) },
62 \\ .{ .name = "unsigned", .field_type = u32, .alignment = @alignOf(u32) },
63 \\ },
64 \\ .decls = &[_]TypeInfo.Declaration{},
65 \\ },
66 \\});
5067 \\export fn entry() void {
51 \\ const y: [:1]const u8 = &[_:2]u8{ 1, 2 };
68 \\ var tagged = Tagged{ .signed = -1 };
69 \\ tagged = .{ .unsigned = 1 };
5270 \\}
5371 , &[_][]const u8{
54 "tmp.zig:2:37: error: expected type '[:1]const u8', found '*const [2:2]u8'",
72 "tmp.zig:15:23: error: enum field missing: 'arst'",
73 "tmp.zig:27:24: note: referenced here",
5574 });
5675
5776 cases.add("@Type for union with opaque field",
......@@ -61,7 +80,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
6180 \\ .layout = .Auto,
6281 \\ .tag_type = null,
6382 \\ .fields = &[_]TypeInfo.UnionField{
64 \\ .{ .name = "foo", .field_type = @Type(.Opaque) },
83 \\ .{ .name = "foo", .field_type = @Type(.Opaque), .alignment = 1 },
6584 \\ },
6685 \\ .decls = &[_]TypeInfo.Declaration{},
6786 \\ },
......@@ -74,6 +93,22 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
7493 "tmp.zig:13:17: note: referenced here",
7594 });
7695
96 cases.add("slice sentinel mismatch",
97 \\export fn entry() void {
98 \\ const x = @import("std").meta.Vector(3, f32){ 25, 75, 5, 0 };
99 \\}
100 , &[_][]const u8{
101 "tmp.zig:2:62: error: index 3 outside vector of size 3",
102 });
103
104 cases.add("slice sentinel mismatch",
105 \\export fn entry() void {
106 \\ const y: [:1]const u8 = &[_:2]u8{ 1, 2 };
107 \\}
108 , &[_][]const u8{
109 "tmp.zig:2:37: error: expected type '[:1]const u8', found '*const [2:2]u8'",
110 });
111
77112 cases.add("@Type for union with zero fields",
78113 \\const TypeInfo = @import("builtin").TypeInfo;
79114 \\const Untagged = @Type(.{
......@@ -130,9 +165,9 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
130165 \\ .layout = .Auto,
131166 \\ .tag_type = Tag,
132167 \\ .fields = &[_]TypeInfo.UnionField{
133 \\ .{ .name = "signed", .field_type = i32 },
134 \\ .{ .name = "unsigned", .field_type = u32 },
135 \\ .{ .name = "arst", .field_type = f32 },
168 \\ .{ .name = "signed", .field_type = i32, .alignment = @alignOf(i32) },
169 \\ .{ .name = "unsigned", .field_type = u32, .alignment = @alignOf(u32) },
170 \\ .{ .name = "arst", .field_type = f32, .alignment = @alignOf(f32) },
136171 \\ },
137172 \\ .decls = &[_]TypeInfo.Declaration{},
138173 \\ },
......@@ -147,42 +182,6 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
147182 "tmp.zig:27:24: note: referenced here",
148183 });
149184
150 cases.add("@Type for tagged union with extra enum field",
151 \\const TypeInfo = @import("builtin").TypeInfo;
152 \\const Tag = @Type(.{
153 \\ .Enum = .{
154 \\ .layout = .Auto,
155 \\ .tag_type = u2,
156 \\ .fields = &[_]TypeInfo.EnumField{
157 \\ .{ .name = "signed", .value = 0 },
158 \\ .{ .name = "unsigned", .value = 1 },
159 \\ .{ .name = "arst", .field_type = 2 },
160 \\ },
161 \\ .decls = &[_]TypeInfo.Declaration{},
162 \\ .is_exhaustive = true,
163 \\ },
164 \\});
165 \\const Tagged = @Type(.{
166 \\ .Union = .{
167 \\ .layout = .Auto,
168 \\ .tag_type = Tag,
169 \\ .fields = &[_]TypeInfo.UnionField{
170 \\ .{ .name = "signed", .field_type = i32 },
171 \\ .{ .name = "unsigned", .field_type = u32 },
172 \\ },
173 \\ .decls = &[_]TypeInfo.Declaration{},
174 \\ },
175 \\});
176 \\export fn entry() void {
177 \\ var tagged = Tagged{ .signed = -1 };
178 \\ tagged = .{ .unsigned = 1 };
179 \\}
180 , &[_][]const u8{
181 "tmp.zig:9:32: error: no member named 'field_type' in struct 'std.builtin.EnumField'",
182 "tmp.zig:18:21: note: referenced here",
183 "tmp.zig:27:18: note: referenced here",
184 });
185
186185 cases.add("@Type with undefined",
187186 \\comptime {
188187 \\ _ = @Type(.{ .Array = .{ .len = 0, .child = u8, .sentinel = undefined } });
......@@ -7592,7 +7591,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
75927591 });
75937592
75947593 cases.add( // fixed bug #2032
7595 "compile diagnostic string for top level decl type",
7594 "compile diagnostic string for top level decl type",
75967595 \\export fn entry() void {
75977596 \\ var foo: u32 = @This(){};
75987597 \\}