authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-18 17:16:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-19 19:03:20-07:00
loge4c437f23baecf9d170f3f058cde78f34dedd5d0
treeb6d6b6fd132fe0b94467445f4bd6816d2126738b
parent6329f4e47a78dc75b234e6d89c82fb3cff058fe1

stage2: implement union member access as enum tag

2 files changed, 65 insertions(+), 39 deletions(-)

src/Sema.zig+61-39
......@@ -2316,7 +2316,7 @@ fn validateStructInit(
23162316 const field_ptr_extra = sema.code.extraData(Zir.Inst.Field, field_ptr_data.payload_index).data;
23172317 const field_name = sema.code.nullTerminatedString(field_ptr_extra.field_name_start);
23182318 const field_index = struct_obj.fields.getIndex(field_name) orelse
2319 return sema.failWithBadFieldAccess(block, struct_obj, field_src, field_name);
2319 return sema.failWithBadStructFieldAccess(block, struct_obj, field_src, field_name);
23202320 if (found_fields[field_index] != 0) {
23212321 const other_field_ptr = found_fields[field_index];
23222322 const other_field_ptr_data = sema.code.instructions.items(.data)[other_field_ptr].pl_node;
......@@ -2378,7 +2378,32 @@ fn zirValidateArrayInit(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Compil
23782378 }
23792379}
23802380
2381fn failWithBadFieldAccess(
2381fn failWithBadMemberAccess(
2382 sema: *Sema,
2383 block: *Block,
2384 agg_ty: Type,
2385 field_src: LazySrcLoc,
2386 field_name: []const u8,
2387) CompileError {
2388 const kw_name = switch (agg_ty.zigTypeTag()) {
2389 .Union => "union",
2390 .Struct => "struct",
2391 .Opaque => "opaque",
2392 .Enum => "enum",
2393 else => unreachable,
2394 };
2395 const msg = msg: {
2396 const msg = try sema.errMsg(block, field_src, "{s} '{}' has no member named '{s}'", .{
2397 kw_name, agg_ty, field_name,
2398 });
2399 errdefer msg.destroy(sema.gpa);
2400 try sema.addDeclaredHereNote(msg, agg_ty);
2401 break :msg msg;
2402 };
2403 return sema.failWithOwnedErrorMsg(msg);
2404}
2405
2406fn failWithBadStructFieldAccess(
23822407 sema: *Sema,
23832408 block: *Block,
23842409 struct_obj: *Module.Struct,
......@@ -8828,7 +8853,7 @@ fn zirStructInit(sema: *Sema, block: *Block, inst: Zir.Inst.Index, is_ref: bool)
88288853 const field_type_extra = sema.code.extraData(Zir.Inst.FieldType, field_type_data.payload_index).data;
88298854 const field_name = sema.code.nullTerminatedString(field_type_extra.name_start);
88308855 const field_index = struct_obj.fields.getIndex(field_name) orelse
8831 return sema.failWithBadFieldAccess(block, struct_obj, field_src, field_name);
8856 return sema.failWithBadStructFieldAccess(block, struct_obj, field_src, field_name);
88328857 if (found_fields[field_index] != 0) {
88338858 const other_field_type = found_fields[field_index];
88348859 const other_field_type_data = zir_datas[other_field_type].pl_node;
......@@ -9037,7 +9062,7 @@ fn zirFieldType(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
90379062 .Struct => {
90389063 const struct_obj = resolved_ty.castTag(.@"struct").?.data;
90399064 const field = struct_obj.fields.get(field_name) orelse
9040 return sema.failWithBadFieldAccess(block, struct_obj, src, field_name);
9065 return sema.failWithBadStructFieldAccess(block, struct_obj, src, field_name);
90419066 return sema.addType(field.ty);
90429067 },
90439068 .Union => {
......@@ -10859,7 +10884,7 @@ fn fieldVal(
1085910884 },
1086010885 else => {},
1086110886 }
10862 return sema.fail(block, src, "type '{}' does not support field access (fieldVal, {}.{s})", .{object_ty, object_ty, field_name});
10887 return sema.fail(block, src, "type '{}' does not support field access (fieldVal, {}.{s})", .{ object_ty, object_ty, field_name });
1086310888}
1086410889
1086510890fn fieldPtr(
......@@ -11001,22 +11026,24 @@ fn fieldPtr(
1100111026 try Value.Tag.@"error".create(anon_decl.arena(), .{ .name = name }),
1100211027 ));
1100311028 },
11004 .Struct, .Opaque, .Union => {
11029 .Union => {
1100511030 if (child_type.getNamespace()) |namespace| {
1100611031 if (try sema.namespaceLookupRef(block, src, namespace, field_name)) |inst| {
1100711032 return inst;
1100811033 }
1100911034 }
11010 // TODO add note: declared here
11011 const kw_name = switch (child_type.zigTypeTag()) {
11012 .Struct => "struct",
11013 .Opaque => "opaque",
11014 .Union => "union",
11015 else => unreachable,
11016 };
11017 return sema.fail(block, src, "{s} '{}' has no member named '{s}'", .{
11018 kw_name, child_type, field_name,
11019 });
11035 if (child_type.unionTagType()) |enum_ty| {
11036 if (enum_ty.enumFieldIndex(field_name)) |field_index| {
11037 const field_index_u32 = @intCast(u32, field_index);
11038 var anon_decl = try block.startAnonDecl();
11039 defer anon_decl.deinit();
11040 return sema.analyzeDeclRef(try anon_decl.finish(
11041 try enum_ty.copy(anon_decl.arena()),
11042 try Value.Tag.enum_field_index.create(anon_decl.arena(), field_index_u32),
11043 ));
11044 }
11045 }
11046 return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);
1102011047 },
1102111048 .Enum => {
1102211049 if (child_type.getNamespace()) |namespace| {
......@@ -11025,23 +11052,7 @@ fn fieldPtr(
1102511052 }
1102611053 }
1102711054 const field_index = child_type.enumFieldIndex(field_name) orelse {
11028 const msg = msg: {
11029 const msg = try sema.errMsg(
11030 block,
11031 src,
11032 "enum '{}' has no member named '{s}'",
11033 .{ child_type, field_name },
11034 );
11035 errdefer msg.destroy(sema.gpa);
11036 try sema.mod.errNoteNonLazy(
11037 child_type.declSrcLoc(),
11038 msg,
11039 "enum declared here",
11040 .{},
11041 );
11042 break :msg msg;
11043 };
11044 return sema.failWithOwnedErrorMsg(msg);
11055 return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);
1104511056 };
1104611057 const field_index_u32 = @intCast(u32, field_index);
1104711058 var anon_decl = try block.startAnonDecl();
......@@ -11051,6 +11062,14 @@ fn fieldPtr(
1105111062 try Value.Tag.enum_field_index.create(anon_decl.arena(), field_index_u32),
1105211063 ));
1105311064 },
11065 .Struct, .Opaque => {
11066 if (child_type.getNamespace()) |namespace| {
11067 if (try sema.namespaceLookupRef(block, src, namespace, field_name)) |inst| {
11068 return inst;
11069 }
11070 }
11071 return sema.failWithBadMemberAccess(block, child_type, field_name_src, field_name);
11072 },
1105411073 else => return sema.fail(block, src, "type '{}' has no members", .{child_type}),
1105511074 }
1105611075 },
......@@ -11070,7 +11089,7 @@ fn fieldPtr(
1107011089 },
1107111090 else => {},
1107211091 }
11073 return sema.fail(block, src, "type '{}' does not support field access (fieldPtr, {}.{s})", .{object_ty, object_ptr_ty, field_name});
11092 return sema.fail(block, src, "type '{}' does not support field access (fieldPtr, {}.{s})", .{ object_ty, object_ptr_ty, field_name });
1107411093}
1107511094
1107611095fn fieldCallBind(
......@@ -11242,7 +11261,7 @@ fn structFieldPtr(
1124211261 const struct_obj = struct_ty.castTag(.@"struct").?.data;
1124311262
1124411263 const field_index_big = struct_obj.fields.getIndex(field_name) orelse
11245 return sema.failWithBadFieldAccess(block, struct_obj, field_name_src, field_name);
11264 return sema.failWithBadStructFieldAccess(block, struct_obj, field_name_src, field_name);
1124611265 const field_index = @intCast(u32, field_index_big);
1124711266 const field = struct_obj.fields.values()[field_index];
1124811267 const ptr_field_ty = try Type.ptr(arena, .{
......@@ -11279,10 +11298,9 @@ fn structFieldVal(
1127911298 const struct_ty = try sema.resolveTypeFields(block, src, unresolved_struct_ty);
1128011299 const struct_obj = struct_ty.castTag(.@"struct").?.data;
1128111300
11282 const field_index_big = struct_obj.fields.getIndex(field_name) orelse
11283 return sema.failWithBadFieldAccess(block, struct_obj, field_name_src, field_name);
11284 const field_index = @intCast(u32, field_index_big);
11285
11301 const field_index_usize = struct_obj.fields.getIndex(field_name) orelse
11302 return sema.failWithBadStructFieldAccess(block, struct_obj, field_name_src, field_name);
11303 const field_index = @intCast(u32, field_index_usize);
1128611304 const field = struct_obj.fields.values()[field_index];
1128711305
1128811306 if (try sema.resolveMaybeUndefVal(block, src, struct_byval)) |struct_val| {
......@@ -13168,6 +13186,10 @@ pub fn resolveTypeLayout(
1316813186 }
1316913187 union_obj.status = .have_layout;
1317013188 },
13189 .Array => {
13190 const elem_ty = ty.childType();
13191 return sema.resolveTypeLayout(block, src, elem_ty);
13192 },
1317113193 else => {},
1317213194 }
1317313195}
src/codegen/llvm.zig+4
......@@ -1261,6 +1261,10 @@ pub const DeclGen = struct {
12611261 }
12621262 const field_ty = tv.ty.unionFieldType(tag_and_val.tag);
12631263 const payload = p: {
1264 if (!field_ty.hasCodeGenBits()) {
1265 const padding_len = @intCast(c_uint, layout.payload_size);
1266 break :p self.context.intType(8).arrayType(padding_len).getUndef();
1267 }
12641268 const field = try genTypedValue(self, .{ .ty = field_ty, .val = tag_and_val.val });
12651269 const field_size = field_ty.abiSize(target);
12661270 if (field_size == layout.payload_size) {