From: Wolfgang (Blub) Bumiller <blub@speed.at>
Date: Wed, 21 Nov 2012 18:55:12 +0000 (+0100)
Subject: Fix wrong merge_id
X-Git-Tag: 0.1.9~375
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=268ad7db537e25acd8bf915a9efdfcfb368eae98;p=xonotic%2Fgmqcc.git

Fix wrong merge_id
---

diff --git a/ast.c b/ast.c
index 48605af..3bfb918 100644
--- a/ast.c
+++ b/ast.c
@@ -1532,7 +1532,7 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
          * but we translate this to (!(!a ? !a : !b))
          */
 
-        merge_id = vec_size(func->blocks);
+        merge_id = vec_size(func->ir_func->blocks);
         merge = ir_function_create_block(func->ir_func, ast_function_label(func, "sce_merge"));
 
         cgen = self->left->expression.codegen;
@@ -1601,6 +1601,8 @@ bool ast_binary_codegen(ast_binary *self, ast_function *func, bool lvalue, ir_va
                                          notop,
                                          *out);
         }
+        if (!*out)
+            return false;
         self->expression.outr = *out;
         return true;
     }