Commit ad747739594805546e0d52d112dfd4a75978c8c7 | zig

author	Robin Voetter <robin@voetter.nl> 2022-09-24 16:16:52+02:00
committer	Robin Voetter <robin@voetter.nl> 2022-10-12 20:36:15+02:00
log	ad747739594805546e0d52d112dfd4a75978c8c7
tree	0beb75cc34ecb604dc07d4ba9550f5f794a32a2b
parent	aa20295d24e77a3de586b203182d4e1cad69d475
signature	Commit is signed but in an unrecognized format.

make addrSpaceCast work with optionals; forbid ptrCast'ing address spaces

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

src
- Sema.zig
- type.zig

src/Sema.zig+11-13

 @@ -18181,11 +18181,10 @@ fn zirAddrSpaceCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.Inst
     const ptr = try sema.resolveInst(extra.rhs);
     const ptr_ty = sema.typeOf(ptr);
-    // TODO in addition to pointers, this instruction is supposed to work for
-    // pointer-like optionals and slices.
     try sema.checkPtrOperand(block, ptr_src, ptr_ty);
-    const src_addrspace = ptr_ty.ptrAddressSpace();
+    var ptr_info = ptr_ty.ptrInfo().data;
+    const src_addrspace = ptr_info.@"addrspace";
     if (!target_util.addrSpaceCastIsValid(sema.mod.getTarget(), src_addrspace, dest_addrspace)) {
         const msg = msg: {
             const msg = try sema.errMsg(block, src, "invalid address space cast", .{});
 @@ -18196,16 +18195,12 @@ fn zirAddrSpaceCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.Inst
         return sema.failWithOwnedErrorMsg(msg);
     }
-    const ptr_info = ptr_ty.ptrInfo().data;
+    ptr_info.@"addrspace" = dest_addrspace;
-    const dest_ty = try Type.ptr(sema.arena, sema.mod, .{
+    const dest_ptr_ty = try Type.ptr(sema.arena, sema.mod, ptr_info);
-        .pointee_type = ptr_info.pointee_type,
+    const dest_ty = if (ptr_ty.zigTypeTag() == .Optional)
-        .@"align" = ptr_info.@"align",
+        try Type.optional(sema.arena, dest_ptr_ty)
-        .@"addrspace" = dest_addrspace,
+    else
-        .mutable = ptr_info.mutable,
+        dest_ptr_ty;
-        .@"allowzero" = ptr_info.@"allowzero",
-        .@"volatile" = ptr_info.@"volatile",
-        .size = ptr_info.size,
-    });
     if (try sema.resolveMaybeUndefVal(block, ptr_src, ptr)) |val| {
         // Pointer value should compatible with both address spaces.
 @@ -18472,6 +18467,9 @@ fn zirPtrCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air
     if (operand_info.@"volatile" and !dest_info.@"volatile") {
         return sema.fail(block, src, "cast discards volatile qualifier", .{});
     }
+    if (operand_info.@"addrspace" != dest_info.@"addrspace") {
+        return sema.fail(block, src, "cast changes pointer address space", .{});
+    }
     const dest_is_slice = dest_ty.isSlice();
     const operand_is_slice = operand_ty.isSlice();

src/type.zig+6

...	@@ -2786,6 +2786,12 @@ pub const Type = extern union {	...	@@ -2786,6 +2786,12 @@ pub const Type = extern union {
2786		2786
2787	.pointer => self.castTag(.pointer).?.data.@"addrspace",	2787	.pointer => self.castTag(.pointer).?.data.@"addrspace",
2788		2788
		2789	.optional => {
		2790	var buf: Payload.ElemType = undefined;
		2791	const child_type = self.optionalChild(&buf);
		2792	return child_type.ptrAddressSpace();
		2793	},
		2794
2789	else => unreachable,	2795	else => unreachable,
2790	};	2796	};
2791	}	2797	}