authorgravatar for wrongnull@gmail.comBogdan Romanyuk <wrongnull@gmail.com> 2023-11-12 12:03:23+03:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-11-12 11:03:23+02:00
log547481c31c8a538a7badbdce66d81820177ce87f
tree7a5d0fecd2eb0b8eb489ba397b83d056fdb627b0
parent2eeb7358227d13ff4d77ef73c54a0e2ae12c1d58
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Sema: fix comparison with undefined

2 files changed, 34 insertions(+), 10 deletions(-)

src/Sema.zig+24-10
...@@ -8898,10 +8898,16 @@ fn analyzeErrUnionCode(sema: *Sema, block: *Block, src: LazySrcLoc, operand: Air...@@ -8898,10 +8898,16 @@ fn analyzeErrUnionCode(sema: *Sema, block: *Block, src: LazySrcLoc, operand: Air
8898 const result_ty = operand_ty.errorUnionSet(mod);8898 const result_ty = operand_ty.errorUnionSet(mod);
88998899
8900 if (try sema.resolveDefinedValue(block, src, operand)) |val| {8900 if (try sema.resolveDefinedValue(block, src, operand)) |val| {
8901 return Air.internedToRef((try mod.intern(.{ .err = .{8901 switch (mod.intern_pool.indexToKey(val.toIntern()).error_union.val) {
8902 .ty = result_ty.toIntern(),8902 .err_name => |err_name| return Air.internedToRef((try mod.intern(.{ .err = .{
8903 .name = mod.intern_pool.indexToKey(val.toIntern()).error_union.val.err_name,8903 .ty = result_ty.toIntern(),
8904 } })));8904 .name = err_name,
8905 } }))),
8906 .payload => |payload| {
8907 assert(payload.toValue().isUndef(mod));
8908 return mod.undefRef(result_ty);
8909 },
8910 }
8905 }8911 }
89068912
8907 try sema.requireRuntimeBlock(block, src, null);8913 try sema.requireRuntimeBlock(block, src, null);
...@@ -16413,6 +16419,7 @@ fn zirCmp(...@@ -16413,6 +16419,7 @@ fn zirCmp(
16413 const rhs_src: LazySrcLoc = .{ .node_offset_bin_rhs = inst_data.src_node };16419 const rhs_src: LazySrcLoc = .{ .node_offset_bin_rhs = inst_data.src_node };
16414 const lhs = try sema.resolveInst(extra.lhs);16420 const lhs = try sema.resolveInst(extra.lhs);
16415 const rhs = try sema.resolveInst(extra.rhs);16421 const rhs = try sema.resolveInst(extra.rhs);
16422
16416 return sema.analyzeCmp(block, src, lhs, rhs, op, lhs_src, rhs_src, false);16423 return sema.analyzeCmp(block, src, lhs, rhs, op, lhs_src, rhs_src, false);
16417}16424}
1641816425
...@@ -16444,10 +16451,16 @@ fn analyzeCmp(...@@ -16444,10 +16451,16 @@ fn analyzeCmp(
16444 return sema.cmpNumeric(block, src, lhs, rhs, op, lhs_src, rhs_src);16451 return sema.cmpNumeric(block, src, lhs, rhs, op, lhs_src, rhs_src);
16445 }16452 }
16446 if (is_equality_cmp and lhs_ty.zigTypeTag(mod) == .ErrorUnion and rhs_ty.zigTypeTag(mod) == .ErrorSet) {16453 if (is_equality_cmp and lhs_ty.zigTypeTag(mod) == .ErrorUnion and rhs_ty.zigTypeTag(mod) == .ErrorSet) {
16454 if (try sema.resolveValue(lhs)) |lhs_val| {
16455 if (lhs_val.isUndef(mod)) return mod.undefRef(Type.bool);
16456 }
16447 const casted_lhs = try sema.analyzeErrUnionCode(block, lhs_src, lhs);16457 const casted_lhs = try sema.analyzeErrUnionCode(block, lhs_src, lhs);
16448 return sema.cmpSelf(block, src, casted_lhs, rhs, op, lhs_src, rhs_src);16458 return sema.cmpSelf(block, src, casted_lhs, rhs, op, lhs_src, rhs_src);
16449 }16459 }
16450 if (is_equality_cmp and lhs_ty.zigTypeTag(mod) == .ErrorSet and rhs_ty.zigTypeTag(mod) == .ErrorUnion) {16460 if (is_equality_cmp and lhs_ty.zigTypeTag(mod) == .ErrorSet and rhs_ty.zigTypeTag(mod) == .ErrorUnion) {
16461 if (try sema.resolveValue(rhs)) |rhs_val| {
16462 if (rhs_val.isUndef(mod)) return mod.undefRef(Type.bool);
16463 }
16451 const casted_rhs = try sema.analyzeErrUnionCode(block, rhs_src, rhs);16464 const casted_rhs = try sema.analyzeErrUnionCode(block, rhs_src, rhs);
16452 return sema.cmpSelf(block, src, lhs, casted_rhs, op, lhs_src, rhs_src);16465 return sema.cmpSelf(block, src, lhs, casted_rhs, op, lhs_src, rhs_src);
16453 }16466 }
...@@ -16511,11 +16524,9 @@ fn cmpSelf(...@@ -16511,11 +16524,9 @@ fn cmpSelf(
16511 } else {16524 } else {
16512 // For bools, we still check the other operand, because we can lower16525 // For bools, we still check the other operand, because we can lower
16513 // bool eq/neq more efficiently.16526 // bool eq/neq more efficiently.
16514 if (resolved_type.zigTypeTag(mod) == .Bool) {16527 if (try sema.resolveValue(casted_rhs)) |rhs_val| {
16515 if (try sema.resolveValue(casted_rhs)) |rhs_val| {16528 if (rhs_val.isUndef(mod)) return mod.undefRef(Type.bool);
16516 if (rhs_val.isUndef(mod)) return mod.undefRef(Type.bool);16529 if (resolved_type.zigTypeTag(mod) == .Bool) return sema.runtimeBoolCmp(block, src, op, casted_lhs, rhs_val.toBool(), lhs_src);
16517 return sema.runtimeBoolCmp(block, src, op, casted_lhs, rhs_val.toBool(), lhs_src);
16518 }
16519 }16530 }
16520 break :src lhs_src;16531 break :src lhs_src;
16521 }16532 }
...@@ -38000,7 +38011,10 @@ fn compareVector(...@@ -38000,7 +38011,10 @@ fn compareVector(
38000 const lhs_elem = try lhs.elemValue(sema.mod, i);38011 const lhs_elem = try lhs.elemValue(sema.mod, i);
38001 const rhs_elem = try rhs.elemValue(sema.mod, i);38012 const rhs_elem = try rhs.elemValue(sema.mod, i);
38002 const res_bool = try sema.compareScalar(lhs_elem, op, rhs_elem, ty.scalarType(mod));38013 const res_bool = try sema.compareScalar(lhs_elem, op, rhs_elem, ty.scalarType(mod));
38003 scalar.* = try Value.makeBool(res_bool).intern(Type.bool, mod);38014 scalar.* = if (lhs_elem.isUndef(mod) or rhs_elem.isUndef(mod))
38015 Air.refToInterned(try mod.undefRef(Type.bool)).?
38016 else
38017 try Value.makeBool(res_bool).intern(Type.bool, mod);
38004 }38018 }
38005 return (try mod.intern(.{ .aggregate = .{38019 return (try mod.intern(.{ .aggregate = .{
38006 .ty = (try mod.vectorType(.{ .len = ty.vectorLen(mod), .child = .bool_type })).toIntern(),38020 .ty = (try mod.vectorType(.{ .len = ty.vectorLen(mod), .child = .bool_type })).toIntern(),
test/cases/compile_errors/comparison_with_comptime-known_undefined.zig created+10
...@@ -0,0 +1,10 @@
1pub fn entry() void {
2 var foo: ?*i32 = undefined;
3 if (foo == undefined) {}
4}
5
6// error
7// backend=stage2
8// target=native
9//
10// :3:13: error: use of undefined value here causes undefined behavior