From 26b79ac90ee8cf17f28b0584c773be759e0e49bd Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 22 Aug 2019 14:46:26 -0400
Subject: simple self-referential struct is working now

---
 src/ir.cpp | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/ir.cpp')

diff --git a/src/ir.cpp b/src/ir.cpp
index e64098be01..92b8598442 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -10814,10 +10814,6 @@ ConstExprValue *ir_eval_const_value(CodeGen *codegen, Scope *scope, AstNode *nod
 
     if (!allow_lazy) {
         if ((err = ir_resolve_lazy(codegen, node, result))) {
-            if (codegen->trace_err != nullptr) {
-                codegen->trace_err = add_error_note(codegen, codegen->trace_err, source_node,
-                    buf_create_from_str("referenced here"));
-            }
             return &codegen->invalid_instruction->value;
         }
     }
@@ -25429,7 +25425,7 @@ bool ir_has_side_effects(IrInstruction *instruction) {
     zig_unreachable();
 }
 
-Error ir_resolve_lazy(CodeGen *codegen, AstNode *source_node, ConstExprValue *val) {
+static Error ir_resolve_lazy_raw(CodeGen *codegen, AstNode *source_node, ConstExprValue *val) {
     Error err;
     if (val->special != ConstValSpecialLazy)
         return ErrorNone;
@@ -25491,3 +25487,15 @@ Error ir_resolve_lazy(CodeGen *codegen, AstNode *source_node, ConstExprValue *va
     }
     zig_unreachable();
 }
+
+Error ir_resolve_lazy(CodeGen *codegen, AstNode *source_node, ConstExprValue *val) {
+    Error err;
+    if ((err = ir_resolve_lazy_raw(codegen, source_node, val))) {
+        if (codegen->trace_err != nullptr) {
+            codegen->trace_err = add_error_note(codegen, codegen->trace_err, source_node,
+                buf_create_from_str("referenced here"));
+        }
+        return err;
+    }
+    return ErrorNone;
+}
-- 
cgit v1.2.3