Ekdohibs/zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix795' of https://github.com/bnoordhuis/zig into bnoordhuis-fix795

Browse Source
This commit is contained in:
Andrew Kelley 2018-02-28 00:22:53 -05:00
commit 1b8a241f6f
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/analyze.cpp
View File

@ -1670,6 +1670,9 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
if (struct_type->data.structure.is_invalid)
return;
if (struct_type->data.structure.zero_bits_loop_flag)
return;
AstNode *decl_node = struct_type->data.structure.decl_node;
if (struct_type->data.structure.embedded_in_current) {
@ -1682,7 +1685,6 @@ static void resolve_struct_type(CodeGen *g, TypeTableEntry *struct_type) {
return;
}
assert(!struct_type->data.structure.zero_bits_loop_flag);
assert(struct_type->data.structure.fields);
assert(decl_node->type == NodeTypeContainerDecl);

12
test/compile_errors.zig
View File

@ -3090,4 +3090,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) void {
,
".tmp_source.zig:11:20: error: runtime cast to union 'Value' which has non-void fields",
".tmp_source.zig:3:5: note: field 'A' has type 'i32'");
cases.add("self-referencing function pointer field",
\\const S = struct {
\\ f: fn(_: S) void,
\\};
\\fn f(_: S) void {
\\}
\\export fn entry() void {
\\ var _ = S { .f = f };
\\}
,
".tmp_source.zig:4:9: error: type 'S' is not copyable; cannot pass by value");
}