zig

commit 8047f0eae2da64a88474dbe9106c61b3e26e6871 (tree)
parent 526338b00fbe1cac19f64832176af3bdf2108a56
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sun, 26 Aug 2018 02:36:18 -0400

fix llvm assertion failure when building std lib tests for macos

closes #1417

Diffstat:
M
src/codegen.cpp
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -5821,6 +5821,7 @@ static void do_code_gen(CodeGen *g) {
 
                 LLVMSetLinkage(global_value, LLVMExternalLinkage);
                 LLVMSetAlignment(global_value, var->align_bytes);
+                LLVMSetGlobalConstant(global_value, var->gen_is_const);
             }
         } else {
             bool exported = (var->linkage == VarLinkageExport);
@@ -5841,9 +5842,9 @@ static void do_code_gen(CodeGen *g) {
             if (var->gen_is_const && var->value->type->id != TypeTableEntryIdFn) {
                 gen_global_var(g, var, var->value->global_refs->llvm_value, var->value->type);
             }
-        }
 
-        LLVMSetGlobalConstant(global_value, var->gen_is_const);
+            LLVMSetGlobalConstant(global_value, var->gen_is_const);
+        }
 
         var->value_ref = global_value;
     }