authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-18 11:18:53-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-06-18 11:18:53-04:00
log8ed88280a62f2a400d00b5ac20618539693dad36
tree6cd87013272a773115a958ce29eff21d05919233
parent99112b5d4ac885f63a79c6f7926f92ff4f3ce819
signature Commit is signed but in an unrecognized format.

Revert "fixes resolving aligment of child type in slice"

This reverts commit aa60d2a688c965dcccf8e2c42afe5c180daba8fc. The copyright ownership of this 10 line patch is under dispute. See #2701 for details. So I'll revert it and then fix it myself without looking at this patch.

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

src/ir.cpp+1-1
...@@ -16794,7 +16794,7 @@ static IrInstruction *ir_analyze_instruction_slice_type(IrAnalyze *ira,...@@ -16794,7 +16794,7 @@ static IrInstruction *ir_analyze_instruction_slice_type(IrAnalyze *ira,
16794 case ZigTypeIdPromise:16794 case ZigTypeIdPromise:
16795 case ZigTypeIdVector:16795 case ZigTypeIdVector:
16796 {16796 {
16797 if ((err = type_resolve(ira->codegen, child_type, ResolveStatusAlignmentKnown)))16797 if ((err = type_resolve(ira->codegen, child_type, ResolveStatusZeroBitsKnown)))
16798 return ira->codegen->invalid_instruction;16798 return ira->codegen->invalid_instruction;
16799 ZigType *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, child_type,16799 ZigType *slice_ptr_type = get_pointer_to_type_extra(ira->codegen, child_type,
16800 is_const, is_volatile, PtrLenUnknown, align_bytes, 0, 0, is_allow_zero);16800 is_const, is_volatile, PtrLenUnknown, align_bytes, 0, 0, is_allow_zero);
test/stage1/behavior.zig-1
...@@ -27,7 +27,6 @@ comptime {...@@ -27,7 +27,6 @@ comptime {
27 _ = @import("behavior/bugs/2114.zig");27 _ = @import("behavior/bugs/2114.zig");
28 _ = @import("behavior/bugs/2346.zig");28 _ = @import("behavior/bugs/2346.zig");
29 _ = @import("behavior/bugs/2578.zig");29 _ = @import("behavior/bugs/2578.zig");
30 _ = @import("behavior/bugs/2689.zig");
31 _ = @import("behavior/bugs/394.zig");30 _ = @import("behavior/bugs/394.zig");
32 _ = @import("behavior/bugs/421.zig");31 _ = @import("behavior/bugs/421.zig");
33 _ = @import("behavior/bugs/529.zig");32 _ = @import("behavior/bugs/529.zig");
test/stage1/behavior/bugs/2689.zig deleted-7
...@@ -1,7 +0,0 @@
1test "slice with alignment" {
2 const S = packed struct {
3 a: u8,
4 };
5
6 var a: []align(8) S = undefined;
7}