Commit 122c76a1670e4b925ccdabaa771f59e5df6d43aa | zig

5 files changed, 14 insertions(+), 12 deletions(-)

lib/compiler_rt/multi3.zig+2-2

...	...	@@ -59,12 +59,12 @@ const twords = extern union {
59	59	s: S,
60	60
61	61	const S = if (native_endian == .Little)
62		struct {
	62	extern struct {
63	63	low: u64,
64	64	high: u64,
65	65	}
66	66	else
67		struct {
	67	extern struct {
68	68	high: u64,
69	69	low: u64,
70	70	};

lib/compiler_rt/shift.zig+2-2

...	...	@@ -31,9 +31,9 @@ fn Dwords(comptime T: type, comptime signed_half: bool) type {
31	31
32	32	all: T,
33	33	s: if (native_endian == .Little)
34		struct { low: HalfT, high: HalfT }
	34	extern struct { low: HalfT, high: HalfT }
35	35	else
36		struct { high: HalfT, low: HalfT },
	36	extern struct { high: HalfT, low: HalfT },
37	37	};
38	38	}
39	39

lib/std/c/haiku.zig+2-2

...	...	@@ -30,8 +30,8 @@ pub extern "c" fn _kern_get_current_team() i32;
30	30	pub const sem_t = extern struct {
31	31	type: i32,
32	32	u: extern union {
33		named_sem_id: ?i32,
34		unnamed_sem: ?i32,
	33	named_sem_id: i32,
	34	unnamed_sem: i32,
35	35	},
36	36	padding: [2]i32,
37	37	};

src/Sema.zig+4-3

...	...	@@ -18192,6 +18192,7 @@ fn explainWhyTypeIsComptime(
18192	18192	const ExternPosition = enum {
18193	18193	ret_ty,
18194	18194	param_ty,
	18195	union_field,
18195	18196	other,
18196	18197	};
18197	18198
...	...	@@ -18206,9 +18207,9 @@ fn validateExternType(sema: *Sema, ty: Type, position: ExternPosition) CompileEr
18206	18207	.ErrorUnion,
18207	18208	.ErrorSet,
18208	18209	.BoundFn,
18209		.Void,
18210	18210	.Frame,
18211	18211	=> return false,
	18212	.Void => return position == .union_field,
18212	18213	.NoReturn => return position == .ret_ty,
18213	18214	.Opaque,
18214	18215	.Bool,
...	...	@@ -24193,13 +24194,13 @@ fn resolveUnionFully(
24193	24194	for (union_obj.fields.values()) \|field\| {
24194	24195	try sema.resolveTypeFully(block, src, field.ty);
24195	24196
24196		if (union_obj.layout == .Extern and !(try sema.validateExternType(field.ty, .other))) {
	24197	if (union_obj.layout == .Extern and !(try sema.validateExternType(field.ty, .union_field))) {
24197	24198	const msg = msg: {
24198	24199	const msg = try sema.errMsg(block, src, "extern unions cannot contain fields of type '{}'", .{field.ty.fmt(sema.mod)});
24199	24200	errdefer msg.destroy(sema.gpa);
24200	24201
24201	24202	const src_decl = sema.mod.declPtr(block.src_decl);
24202		try sema.explainWhyTypeIsNotExtern(block, src, msg, src.toSrcLoc(src_decl), field.ty, .other);
	24203	try sema.explainWhyTypeIsNotExtern(block, src, msg, src.toSrcLoc(src_decl), field.ty, .union_field);
24203	24204
24204	24205	try sema.addDeclaredHereNote(msg, field.ty);
24205	24206	break :msg msg;

test/behavior/union.zig+4-3

...	...	@@ -84,18 +84,19 @@ test "comptime union field access" {
84	84
85	85	const FooExtern = extern union {
86	86	int: i32,
87		str: struct {
88		slice: []const u8,
	87	str: extern struct {
	88	slice: [*:0]const u8,
89	89	},
90	90	};
91	91
92	92	test "basic extern unions" {
	93	if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
93	94	if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
94	95
95	96	var foo = FooExtern{ .int = 1 };
96	97	try expect(foo.int == 1);
97	98	foo.str.slice = "Well";
98		try expect(std.mem.eql(u8, foo.str.slice, "Well"));
	99	try expect(std.mem.eql(u8, std.mem.sliceTo(foo.str.slice, 0), "Well"));
99	100	}
100	101
101	102	const ExternPtrOrInt = extern union {