authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-10-26 01:13:53-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-10-26 01:13:53-04:00
logf2a174b294f3322c45510d199bc14ab2c0aadbfc
tree15a9c47f38b5671e29d568c6f8de895b06a9e7f3
parentdf198ea60e05664b5b72a43aae815fa06d94c19c
parentf95ec229f8478eedbb59700cbd223367ebd89a86
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #10035 from Snektron/stage2-orelse

stage2: improve orelse for c-pointers

1 files changed, 12 insertions(+), 2 deletions(-)

src/Sema.zig+12-2
......@@ -3035,10 +3035,11 @@ fn analyzeBlockBody(
30353035 // to emit a jump instruction to after the block when it encounters the break.
30363036 try parent_block.instructions.append(gpa, merges.block_inst);
30373037 const resolved_ty = try sema.resolvePeerTypes(parent_block, src, merges.results.items, .none);
3038 const ty_inst = try sema.addType(resolved_ty);
30383039 try sema.air_extra.ensureUnusedCapacity(gpa, @typeInfo(Air.Block).Struct.fields.len +
30393040 child_block.instructions.items.len);
30403041 sema.air_instructions.items(.data)[merges.block_inst] = .{ .ty_pl = .{
3041 .ty = try sema.addType(resolved_ty),
3042 .ty = ty_inst,
30423043 .payload = sema.addExtraAssumeCapacity(Air.Block{
30433044 .body_len = @intCast(u32, child_block.instructions.items.len),
30443045 }),
......@@ -4666,7 +4667,16 @@ fn zirOptionalPayload(
46664667 if (operand_ty.ptrSize() != .C) {
46674668 return sema.failWithExpectedOptionalType(block, src, operand_ty);
46684669 }
4669 break :t operand_ty;
4670 const ptr_info = operand_ty.ptrInfo().data;
4671 break :t try Type.ptr(sema.arena, .{
4672 .pointee_type = try ptr_info.pointee_type.copy(sema.arena),
4673 .@"align" = ptr_info.@"align",
4674 .@"addrspace" = ptr_info.@"addrspace",
4675 .mutable = ptr_info.mutable,
4676 .@"allowzero" = ptr_info.@"allowzero",
4677 .@"volatile" = ptr_info.@"volatile",
4678 .size = .One,
4679 });
46704680 },
46714681 else => return sema.failWithExpectedOptionalType(block, src, operand_ty),
46724682 };