mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-27 08:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv: fix incorrect repr of some optional operations

Browse Source
This commit is contained in:
Robin Voetter 2023-10-08 00:06:06 +02:00
parent 0a3e566f57
commit 15cf1315bb
No known key found for this signature in database
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/codegen/spirv.zig
View File

@ -3594,11 +3594,13 @@ const DeclGen = struct {
return result_id; return result_id;
} }
const is_non_null_id = if (optional_ty.hasRuntimeBitsIgnoreComptime(mod)) const is_non_null_id = if (payload_ty.hasRuntimeBitsIgnoreComptime(mod))
try self.extractField(Type.bool, operand_id, 1) try self.extractField(Type.bool, operand_id, 1)
else else
// Optional representation is bool indicating whether the optional is set // Optional representation is bool indicating whether the optional is set
operand_id; // Optionals with no payload are represented as an (indirect) bool, so convert
// it back to the direct bool here.
try self.convertToDirect(Type.bool, operand_id);
return switch (pred) { return switch (pred) {
.is_null => blk: { .is_null => blk: {
@ -3677,17 +3679,19 @@ const DeclGen = struct {
const payload_ty = self.typeOf(ty_op.operand); const payload_ty = self.typeOf(ty_op.operand);
if (!payload_ty.hasRuntimeBitsIgnoreComptime(mod)) { if (!payload_ty.hasRuntimeBitsIgnoreComptime(mod)) {
return try self.constBool(true, .direct); return try self.constBool(true, .indirect);
} }
const operand_id = try self.resolve(ty_op.operand); const operand_id = try self.resolve(ty_op.operand);
const optional_ty = self.typeOfIndex(inst); const optional_ty = self.typeOfIndex(inst);
if (optional_ty.optionalReprIsPayload(mod)) { if (optional_ty.optionalReprIsPayload(mod)) {
return operand_id; return operand_id;
} }
const optional_ty_ref = try self.resolveType(optional_ty, .direct); const optional_ty_ref = try self.resolveType(optional_ty, .direct);
const members = [_]IdRef{ operand_id, try self.constBool(true, .indirect) }; const payload_id = try self.convertToIndirect(payload_ty, operand_id);
const members = [_]IdRef{ payload_id, try self.constBool(true, .indirect) };
return try self.constructStruct(optional_ty_ref, &members); return try self.constructStruct(optional_ty_ref, &members);
} }

1
test/behavior/cast.zig
View File

@ -240,7 +240,6 @@ test "coerce undefined to optional" {
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
try expect(MakeType(void).getNull() == null); try expect(MakeType(void).getNull() == null);
try expect(MakeType(void).getNonNull() != null); try expect(MakeType(void).getNonNull() != null);

1
test/behavior/for.zig
View File

@ -492,7 +492,6 @@ test "inferred alloc ptr of for loop" {
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
{ {
var cond = false; var cond = false;