mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-15 13:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into llvm7

Browse Source
This commit is contained in:
Andrew Kelley 2018-08-26 02:39:26 -04:00
commit f7f11e237c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/codegen.cpp
View File

@ -5732,6 +5732,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);
@ -5752,9 +5753,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;
}