From b6108eed522b7a0122d305dc1a74de8f12f20d5b Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Mon, 3 Jun 2019 19:11:41 -0400
Subject: [PATCH] fix alignment of consts

---
 BRANCH_TODO       |  1 -
 src/all_types.hpp |  1 +
 src/codegen.cpp   |  3 ++-
 src/ir.cpp        | 21 ++++++++++++---------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/BRANCH_TODO b/BRANCH_TODO
index 6509246908..e809e2b4d8 100644
--- a/BRANCH_TODO
+++ b/BRANCH_TODO
@@ -1,7 +1,6 @@
 Scratch pad for stuff to do before merging master
 =================================================
 
- * alignment of consts
  * implicit casts
  * for loops
  * switch expression
diff --git a/src/all_types.hpp b/src/all_types.hpp
index c6346ca009..0df5384c7a 100644
--- a/src/all_types.hpp
+++ b/src/all_types.hpp
@@ -292,6 +292,7 @@ struct RuntimeHintSlice {
 struct ConstGlobalRefs {
     LLVMValueRef llvm_value;
     LLVMValueRef llvm_global;
+    uint32_t align;
 };
 
 struct ConstExprValue {
diff --git a/src/codegen.cpp b/src/codegen.cpp
index da4be1bf23..b03068eb7d 100644
--- a/src/codegen.cpp
+++ b/src/codegen.cpp
@@ -6599,7 +6599,8 @@ static void render_const_val_global(CodeGen *g, ConstExprValue *const_val, const
         LLVMSetLinkage(global_value, LLVMInternalLinkage);
         LLVMSetGlobalConstant(global_value, true);
         LLVMSetUnnamedAddr(global_value, true);
-        LLVMSetAlignment(global_value, get_abi_alignment(g, const_val->type));
+        LLVMSetAlignment(global_value, (const_val->global_refs->align == 0) ?
+                get_abi_alignment(g, const_val->type) : const_val->global_refs->align);
 
         const_val->global_refs->llvm_global = global_value;
     }
diff --git a/src/ir.cpp b/src/ir.cpp
index 35e71be1c2..f8e77cdd72 100644
--- a/src/ir.cpp
+++ b/src/ir.cpp
@@ -14363,19 +14363,22 @@ static IrInstruction *ir_resolve_result(IrAnalyze *ira, ResultLoc *result_loc, Z
             IrInstructionAllocaSrc *alloca_src =
                 reinterpret_cast<IrInstructionAllocaSrc *>(result_loc->source_instruction);
             if (alloca_src->base.child == nullptr) {
-                bool is_comptime = value != nullptr && value->value.special != ConstValSpecialRuntime &&
-                    result_loc_var->var->gen_is_const;
+                bool force_comptime;
+                if (!ir_resolve_comptime(ira, alloca_src->is_comptime->child, &force_comptime))
+                    return ira->codegen->invalid_instruction;
+                bool is_comptime = force_comptime || (value != nullptr &&
+                        value->value.special != ConstValSpecialRuntime && result_loc_var->var->gen_is_const);
+                uint32_t align = 0;
+                if (alloca_src->align != nullptr && !ir_resolve_align(ira, alloca_src->align->child, &align)) {
+                    return ira->codegen->invalid_instruction;
+                }
                 IrInstruction *alloca_gen;
                 if (is_comptime) {
+                    if (align > value->value.global_refs->align) {
+                        value->value.global_refs->align = align;
+                    }
                     alloca_gen = ir_get_ref(ira, result_loc->source_instruction, value, true, false);
                 } else {
-                    uint32_t align = 0;
-                    if (alloca_src->align != nullptr && !ir_resolve_align(ira, alloca_src->align->child, &align)) {
-                        return ira->codegen->invalid_instruction;
-                    }
-                    bool force_comptime;
-                    if (!ir_resolve_comptime(ira, alloca_src->is_comptime->child, &force_comptime))
-                        return ira->codegen->invalid_instruction;
                     alloca_gen = ir_analyze_alloca(ira, result_loc->source_instruction, value_type, align,
                             alloca_src->name_hint, force_comptime);
                 }