motiejus/zig
1
Fork 0
Code Releases Activity

Sema: fix fieldCallBind on tuples and anon structs

Browse Source 
Closes #12573
This commit is contained in:
Veikka Tuominen
2022-08-22 11:13:01 +03:00
parent 560baf67ce
commit 5404dcdfd8
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Sema.zig
View File

@@ -21394,14 +21394,30 @@ fn fieldCallBind(
switch (concrete_ty.zigTypeTag()) {
.Struct => {
const struct_ty = try sema.resolveTypeFields(block, src, concrete_ty);
const struct_obj = struct_ty.castTag(.@"struct").?.data;
if (struct_ty.castTag(.@"struct")) |struct_obj| {
const field_index_usize = struct_obj.data.fields.getIndex(field_name) orelse
break :find_field;
const field_index = @intCast(u32, field_index_usize);
const field = struct_obj.data.fields.values()[field_index];
const field_index_usize = struct_obj.fields.getIndex(field_name) orelse
break :find_field;
const field_index = @intCast(u32, field_index_usize);
const field = struct_obj.fields.values()[field_index];
return finishFieldCallBind(sema, block, src, ptr_ty, field.ty, field_index, object_ptr);
return finishFieldCallBind(sema, block, src, ptr_ty, field.ty, field_index, object_ptr);
} else if (struct_ty.isTuple()) {
if (mem.eql(u8, field_name, "len")) {
return sema.addIntUnsigned(Type.usize, struct_ty.structFieldCount());
}
if (std.fmt.parseUnsigned(u32, field_name, 10)) |field_index| {
if (field_index >= struct_ty.structFieldCount()) break :find_field;
return finishFieldCallBind(sema, block, src, ptr_ty, struct_ty.structFieldType(field_index), field_index, object_ptr);
} else |_| {}
} else {
const max = struct_ty.structFieldCount();
var i: u32 = 0;
while (i < max) : (i += 1) {
if (mem.eql(u8, struct_ty.structFieldName(i), field_name)) {
return finishFieldCallBind(sema, block, src, ptr_ty, struct_ty.structFieldType(i), i, object_ptr);
}
}
}
},
.Union => {
const union_ty = try sema.resolveTypeFields(block, src, concrete_ty);

8
test/cases/compile_errors/bogus_method_call_on_slice.zig
View File

@@ -3,9 +3,17 @@ fn f(m: []const u8) void {
m.copy(u8, self[0..], m);
}
export fn entry() usize { return @sizeOf(@TypeOf(&f)); }
pub export fn entry1() void {
.{}.bar();
}
pub export fn entry2() void {
.{ .foo = 1 }.bar();
}
// error
// backend=stage2
// target=native
//
// :7:8: error: no field or member function named 'bar' in '@TypeOf(.{})'
// :10:18: error: no field or member function named 'bar' in 'struct{comptime foo: comptime_int = 1}'
// :3:6: error: no field or member function named 'copy' in '[]const u8'