authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-26 02:36:18-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-08-26 02:36:18-04:00
log8047f0eae2da64a88474dbe9106c61b3e26e6871
tree6e67a5ac7d615580ac2c5114c2326cc23336574f
parent526338b00fbe1cac19f64832176af3bdf2108a56

fix llvm assertion failure when building std lib tests for macos

closes #1417

1 files changed, 3 insertions(+), 2 deletions(-)

src/codegen.cpp+3-2
...@@ -5821,6 +5821,7 @@ static void do_code_gen(CodeGen *g) {...@@ -5821,6 +5821,7 @@ static void do_code_gen(CodeGen *g) {
58215821
5822 LLVMSetLinkage(global_value, LLVMExternalLinkage);5822 LLVMSetLinkage(global_value, LLVMExternalLinkage);
5823 LLVMSetAlignment(global_value, var->align_bytes);5823 LLVMSetAlignment(global_value, var->align_bytes);
5824 LLVMSetGlobalConstant(global_value, var->gen_is_const);
5824 }5825 }
5825 } else {5826 } else {
5826 bool exported = (var->linkage == VarLinkageExport);5827 bool exported = (var->linkage == VarLinkageExport);
...@@ -5841,9 +5842,9 @@ static void do_code_gen(CodeGen *g) {...@@ -5841,9 +5842,9 @@ static void do_code_gen(CodeGen *g) {
5841 if (var->gen_is_const && var->value->type->id != TypeTableEntryIdFn) {5842 if (var->gen_is_const && var->value->type->id != TypeTableEntryIdFn) {
5842 gen_global_var(g, var, var->value->global_refs->llvm_value, var->value->type);5843 gen_global_var(g, var, var->value->global_refs->llvm_value, var->value->type);
5843 }5844 }
5844 }
58455845
5846 LLVMSetGlobalConstant(global_value, var->gen_is_const);5846 LLVMSetGlobalConstant(global_value, var->gen_is_const);
5847 }
58475848
5848 var->value_ref = global_value;5849 var->value_ref = global_value;
5849 }5850 }