zig

commit b6c8fead00aa5d7b39697aedb0cb1eef53010b83 (tree)
parent fbcee58cfcabddd3e0842e22141a983a8169502f
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu,  9 Jan 2020 19:29:51 -0500

fix regression in global const alignment

Diffstat:
M
src/analyze.cpp
 | 
2
++
M
src/ir.cpp
 | 
1
+
M
test/stage1/behavior.zig
 | 
2
+-

3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/analyze.cpp b/src/analyze.cpp
@@ -9303,7 +9303,9 @@ bool type_has_optional_repr(ZigType *ty) {
 }
 
 void copy_const_val(ZigValue *dest, ZigValue *src) {
+    uint32_t prev_align = dest->llvm_align;
     memcpy(dest, src, sizeof(ZigValue));
+    dest->llvm_align = prev_align;
     if (src->special != ConstValSpecialStatic)
         return;
     dest->parent.id = ConstParentIdNone;
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -17052,6 +17052,7 @@ static IrInstruction *ir_analyze_alloca(IrAnalyze *ira, IrInstruction *source_in
 
     ZigValue *pointee = create_const_vals(1);
     pointee->special = ConstValSpecialUndef;
+    pointee->llvm_align = align;
 
     IrInstructionAllocaGen *result = ir_build_alloca_gen(ira, source_inst, align, name_hint);
     result->base.value->special = ConstValSpecialStatic;
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
@@ -24,7 +24,7 @@ comptime {
     _ = @import("behavior/bugs/1500.zig");
     _ = @import("behavior/bugs/1607.zig");
     _ = @import("behavior/bugs/1735.zig");
-    //_ = @import("behavior/bugs/1741.zig");
+    _ = @import("behavior/bugs/1741.zig");
     _ = @import("behavior/bugs/1851.zig");
     _ = @import("behavior/bugs/1914.zig");
     _ = @import("behavior/bugs/2006.zig");