Merge pull request #12198 from Vexu/stage2

Sema: fix loading and storing of optional pointers represented as pointers

2 files changed, 5 insertions, 3 deletions

diff --git a/src/codegen/c.zig b/src/codegen/c.zig
index 15eb917fda..1e629d7cb0 100644
--- a/src/codegen/c.zig
+++ b/src/codegen/c.zig
@@ -3618,8 +3618,9 @@ fn airIsErr(
     const operand = try f.resolveInst(un_op);
     const operand_ty = f.air.typeOf(un_op);
     const local = try f.allocLocal(Type.initTag(.bool), .Const);
-    const payload_ty = operand_ty.errorUnionPayload();
-    const error_ty = operand_ty.errorUnionSet();
+    const err_union_ty = if (is_ptr) operand_ty.childType() else operand_ty;
+    const payload_ty = err_union_ty.errorUnionPayload();
+    const error_ty = err_union_ty.errorUnionSet();
 
     try writer.writeAll(" = ");
 
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
index 6ebbd2aaf8..6966d8b164 100644
--- a/src/codegen/llvm.zig
+++ b/src/codegen/llvm.zig
@@ -5697,7 +5697,8 @@ pub const FuncGen = struct {
 
         const un_op = self.air.instructions.items(.data)[inst].un_op;
         const operand = try self.resolveInst(un_op);
-        const err_union_ty = self.air.typeOf(un_op);
+        const operand_ty = self.air.typeOf(un_op);
+        const err_union_ty = if (operand_is_ptr) operand_ty.childType() else operand_ty;
         const payload_ty = err_union_ty.errorUnionPayload();
         const err_set_ty = try self.dg.lowerType(Type.initTag(.anyerror));
         const zero = err_set_ty.constNull();