authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-09-19 12:38:31+03:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2022-09-19 18:34:52+03:00
loge584558bd8533ce91d1683cdbc6b77d7bb652acf
tree640be3ada9fe338c396adbae29e6dccc54987d71
parente42f83825f1473661700f89ffd3060013261d605

Sema: do not use coerceCompatiblePtr for alignCast

Closes #12902

2 files changed, 16 insertions(+), 17 deletions(-)

src/Sema.zig+8-17
......@@ -17931,23 +17931,14 @@ fn zirAlignCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
1793117931 const ptr = try sema.resolveInst(extra.rhs);
1793217932 const ptr_ty = sema.typeOf(ptr);
1793317933
17934 // TODO in addition to pointers, this instruction is supposed to work for
17935 // pointer-like optionals and slices.
1793617934 try sema.checkPtrOperand(block, ptr_src, ptr_ty);
1793717935
17938 // TODO compile error if the result pointer is comptime known and would have an
17939 // alignment that disagrees with the Decl's alignment.
17940
17941 const ptr_info = ptr_ty.ptrInfo().data;
17942 const dest_ty = try Type.ptr(sema.arena, sema.mod, .{
17943 .pointee_type = ptr_info.pointee_type,
17944 .@"align" = dest_align,
17945 .@"addrspace" = ptr_info.@"addrspace",
17946 .mutable = ptr_info.mutable,
17947 .@"allowzero" = ptr_info.@"allowzero",
17948 .@"volatile" = ptr_info.@"volatile",
17949 .size = ptr_info.size,
17950 });
17936 var ptr_info = ptr_ty.ptrInfo().data;
17937 ptr_info.@"align" = dest_align;
17938 var dest_ty = try Type.ptr(sema.arena, sema.mod, ptr_info);
17939 if (ptr_ty.zigTypeTag() == .Optional) {
17940 dest_ty = try Type.Tag.optional.create(sema.arena, dest_ty);
17941 }
1795117942
1795217943 if (try sema.resolveDefinedValue(block, ptr_src, ptr)) |val| {
1795317944 if (try val.getUnsignedIntAdvanced(sema.mod.getTarget(), null)) |addr| {
......@@ -17960,7 +17951,7 @@ fn zirAlignCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
1796017951
1796117952 try sema.requireRuntimeBlock(block, inst_data.src(), ptr_src);
1796217953 if (block.wantSafety() and dest_align > 1 and
17963 try sema.typeHasRuntimeBits(block, sema.src, dest_ty.elemType2()))
17954 try sema.typeHasRuntimeBits(block, sema.src, ptr_info.pointee_type))
1796417955 {
1796517956 const val_payload = try sema.arena.create(Value.Payload.U64);
1796617957 val_payload.* = .{
......@@ -17985,7 +17976,7 @@ fn zirAlignCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!A
1798517976 } else is_aligned;
1798617977 try sema.addSafetyCheck(block, ok, .incorrect_alignment);
1798717978 }
17988 return sema.coerceCompatiblePtrs(block, dest_ty, ptr, ptr_src);
17979 return sema.bitCast(block, dest_ty, ptr, ptr_src);
1798917980}
1799017981
1799117982fn zirBitCount(
test/behavior/align.zig+8
......@@ -556,3 +556,11 @@ test "comptime alloc alignment" {
556556 var bytes2_addr = @ptrToInt(&bytes2);
557557 try expect(bytes2_addr & 0xff == 0);
558558}
559
560test "@alignCast null" {
561 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
562
563 var ptr: ?*anyopaque = null;
564 const aligned: ?*anyopaque = @alignCast(@alignOf(?*anyopaque), ptr);
565 try expect(aligned == null);
566}