From 27b290f3125b2526200bad4a818f9f43ba58ee2e Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Wed, 8 Jan 2020 21:32:53 +0100
Subject: [PATCH] Propagate more failures upwards

Fixes #4112
---
 src/analyze.cpp | 7 ++++++-
 src/ir.cpp      | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/analyze.cpp b/src/analyze.cpp
index b15d986558..a19b56cc9d 100644
--- a/src/analyze.cpp
+++ b/src/analyze.cpp
@@ -4787,11 +4787,16 @@ static void analyze_fn_body(CodeGen *g, ZigFn *fn_table_entry) {
     ZigType *fn_type = fn_table_entry->type_entry;
     assert(!fn_type->data.fn.is_generic);
 
-    ir_gen_fn(g, fn_table_entry);
+    if (!ir_gen_fn(g, fn_table_entry)) {
+        fn_table_entry->anal_state = FnAnalStateInvalid;
+        return;
+    }
+
     if (fn_table_entry->ir_executable->first_err_trace_msg != nullptr) {
         fn_table_entry->anal_state = FnAnalStateInvalid;
         return;
     }
+
     if (g->verbose_ir) {
         fprintf(stderr, "\n");
         ast_render(stderr, fn_table_entry->body_node, 4);
diff --git a/src/ir.cpp b/src/ir.cpp
index e841da35d0..1d55736b0c 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -9164,7 +9164,10 @@ bool ir_gen(CodeGen *codegen, AstNode *node, Scope *scope, IrExecutable *ir_exec
     ir_ref_bb(irb->current_basic_block);
 
     IrInstruction *result = ir_gen_node_extra(irb, node, scope, LValNone, nullptr);
-    assert(result);
+
+    if (result == irb->codegen->invalid_instruction)
+        return false;
+
     if (irb->exec->first_err_trace_msg != nullptr) {
         codegen->trace_err = irb->exec->first_err_trace_msg;
         return false;
@@ -12029,7 +12032,9 @@ ZigValue *ir_eval_const_value(CodeGen *codegen, Scope *scope, AstNode *node,
     ir_executable->fn_entry = fn_entry;
     ir_executable->c_import_buf = c_import_buf;
     ir_executable->begin_scope = scope;
-    ir_gen(codegen, node, scope, ir_executable);
+
+    if (!ir_gen(codegen, node, scope, ir_executable))
+        return codegen->invalid_instruction->value;
 
     if (ir_executable->first_err_trace_msg != nullptr) {
         codegen->trace_err = ir_executable->first_err_trace_msg;