mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sema: resolve peer vector types before comparison

Browse source 
Resolves: #15732
This commit is contained in:
mlugg 2023-06-10 01:50:05 +01:00 • committed by Veikka Tuominen
parent c842deea75
commit 1e7dcaa3ae
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Sema.zig
View file

@ -30158,15 +30158,19 @@ fn cmpVector(
assert(rhs_ty.zigTypeTag() == .Vector); assert(rhs_ty.zigTypeTag() == .Vector);
try sema.checkVectorizableBinaryOperands(block, src, lhs_ty, rhs_ty, lhs_src, rhs_src); try sema.checkVectorizableBinaryOperands(block, src, lhs_ty, rhs_ty, lhs_src, rhs_src);
const resolved_ty = try sema.resolvePeerTypes(block, src, &.{ lhs, rhs }, .{ .override = &.{ lhs_src, rhs_src } });
const casted_lhs = try sema.coerce(block, resolved_ty, lhs, lhs_src);
const casted_rhs = try sema.coerce(block, resolved_ty, rhs, rhs_src);
const result_ty = try Type.vector(sema.arena, lhs_ty.vectorLen(), Type.bool); const result_ty = try Type.vector(sema.arena, lhs_ty.vectorLen(), Type.bool);
const runtime_src: LazySrcLoc = src: { const runtime_src: LazySrcLoc = src: {
if (try sema.resolveMaybeUndefVal(lhs)) |lhs_val| { if (try sema.resolveMaybeUndefVal(casted_lhs)) |lhs_val| {
if (try sema.resolveMaybeUndefVal(rhs)) |rhs_val| { if (try sema.resolveMaybeUndefVal(casted_rhs)) |rhs_val| {
if (lhs_val.isUndef() or rhs_val.isUndef()) { if (lhs_val.isUndef() or rhs_val.isUndef()) {
return sema.addConstUndef(result_ty); return sema.addConstUndef(result_ty);
} }
const cmp_val = try sema.compareVector(lhs_val, op, rhs_val, lhs_ty); const cmp_val = try sema.compareVector(lhs_val, op, rhs_val, resolved_ty);
return sema.addConstant(result_ty, cmp_val); return sema.addConstant(result_ty, cmp_val);
} else { } else {
break :src rhs_src; break :src rhs_src;
@ -30177,7 +30181,7 @@ fn cmpVector(
}; };
try sema.requireRuntimeBlock(block, src, runtime_src); try sema.requireRuntimeBlock(block, src, runtime_src);
return block.addCmpVector(lhs, rhs, op); return block.addCmpVector(casted_lhs, casted_rhs, op);
} }
fn wrapOptional( fn wrapOptional(

13
test/behavior/vector.zig
View file

@ -1330,3 +1330,16 @@ test "addition of vectors represented as strings" {
const bar: V = @typeName(u32).*; const bar: V = @typeName(u32).*;
try expectEqual(V{ 219, 162, 161 }, foo + bar); try expectEqual(V{ 219, 162, 161 }, foo + bar);
} }
test "compare vectors with different element types" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
var a: @Vector(2, u8) = .{ 1, 2 };
var b: @Vector(2, u9) = .{ 3, 0 };
try expectEqual(@Vector(2, bool){ true, false }, a < b);
}