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

2 files changed, 15 insertions, 1 deletions

diff --git a/src/analyze.cpp b/src/analyze.cpp
index c16a5d462a..9d5e7d77af 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -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);
 
diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index 940125711b..a3ac4e2344 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -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");
 }