zig

commit f7f11e237c96a357e9a5e8b4a8ce2c6a7499de3b (tree)
parent cce14f92fc2e284114bc9d08bc93e55d45a55188
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sun, 26 Aug 2018 02:39:26 -0400

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

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

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -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;
     }