authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-10 14:17:27-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-10 14:21:37-07:00
log9f163310f2bfa4f5289c1db6231089f3be0c9b93
treea3e6012d38c15d34c847773c27189c8a4f1edadb
parent569870ca41e73c64d8dc9f1eccfef3529caf2266

stage2: improve Type.eql and Type.hash for error sets

* Reduce branching in Type.eql and Type.hash for error sets. * `Type.eql` uses element-wise bytes comparison since it can rely on the error sets being pre-sorted. * Avoid unnecessarily skipping tests that are passing.

3 files changed, 43 insertions(+), 60 deletions(-)

src/type.zig+22-23
......@@ -556,37 +556,36 @@ pub const Type = extern union {
556556 return info_a.signedness == info_b.signedness and info_a.bits == info_b.bits;
557557 },
558558
559 .error_set_inferred => {
560 // Inferred error sets are only equal if both are inferred
561 // and they originate from the exact same function.
562 const a_set = a.castTag(.error_set_inferred).?.data;
563 const b_set = (b.castTag(.error_set_inferred) orelse return false).data;
564 return a_set.func == b_set.func;
565 },
566
567 .anyerror => {
568 return b.tag() == .anyerror;
569 },
570
559571 .error_set,
560572 .error_set_single,
561 .anyerror,
562 .error_set_inferred,
563573 .error_set_merged,
564574 => {
565 if (b.zigTypeTag() != .ErrorSet) return false;
566
567 // inferred error sets are only equal if both are inferred
568 // and they originate from the exact same function.
569 if (a.castTag(.error_set_inferred)) |a_pl| {
570 if (b.castTag(.error_set_inferred)) |b_pl| {
571 return a_pl.data.func == b_pl.data.func;
572 }
573 return false;
575 switch (b.tag()) {
576 .error_set, .error_set_single, .error_set_merged => {},
577 else => return false,
574578 }
575 if (b.tag() == .error_set_inferred) return false;
576
577 // anyerror matches exactly.
578 const a_is_any = a.isAnyError();
579 const b_is_any = b.isAnyError();
580 if (a_is_any or b_is_any) return a_is_any and b_is_any;
581579
582 // two resolved sets match if their error set names match.
580 // Two resolved sets match if their error set names match.
581 // Since they are pre-sorted we compare them element-wise.
583582 const a_set = a.errorSetNames();
584583 const b_set = b.errorSetNames();
585584 if (a_set.len != b_set.len) return false;
586 for (b_set) |b_val| {
587 if (!a.errorSetHasField(b_val)) return false;
585 for (a_set) |a_item, i| {
586 const b_item = b_set[i];
587 if (!std.mem.eql(u8, a_item, b_item)) return false;
588588 }
589
590589 return true;
591590 },
592591
......@@ -984,10 +983,10 @@ pub const Type = extern union {
984983
985984 .error_set_inferred => {
986985 // inferred error sets are compared using their data pointer
987 const data = ty.castTag(.error_set_inferred).?.data.func;
986 const set = ty.castTag(.error_set_inferred).?.data;
988987 std.hash.autoHash(hasher, std.builtin.TypeId.ErrorSet);
989988 std.hash.autoHash(hasher, Tag.error_set_inferred);
990 std.hash.autoHash(hasher, data);
989 std.hash.autoHash(hasher, set.func);
991990 },
992991
993992 .@"opaque" => {
test/behavior/error.zig+21-35
......@@ -330,11 +330,11 @@ fn intLiteral(str: []const u8) !?i64 {
330330}
331331
332332test "nested error union function call in optional unwrap" {
333 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
334333 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
335 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
336 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
337 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
334 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
335 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
336 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
337 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
338338
339339 const S = struct {
340340 const Foo = struct {
......@@ -381,9 +381,9 @@ test "nested error union function call in optional unwrap" {
381381test "return function call to error set from error union function" {
382382 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
383383 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
384 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
385 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
386 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
384 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
385 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
386 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
387387
388388 const S = struct {
389389 fn errorable() anyerror!i32 {
......@@ -414,9 +414,9 @@ test "optional error set is the same size as error set" {
414414test "nested catch" {
415415 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
416416 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
417 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
418 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
419 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
417 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
418 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
419 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
420420
421421 const S = struct {
422422 fn entry() !void {
......@@ -440,14 +440,16 @@ test "nested catch" {
440440}
441441
442442test "function pointer with return type that is error union with payload which is pointer of parent struct" {
443 // This test uses the stage2 const fn pointer
444 if (builtin.zig_backend == .stage1) return error.SkipZigTest;
443 if (builtin.zig_backend == .stage1) {
444 // stage1 has wrong function pointer semantics
445 return error.SkipZigTest;
446 }
445447
446448 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
447449 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
448 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
449 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
450 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
450 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
451 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
452 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
451453
452454 const S = struct {
453455 const Foo = struct {
......@@ -501,9 +503,9 @@ test "return result loc as peer result loc in inferred error set function" {
501503test "error payload type is correctly resolved" {
502504 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
503505 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
504 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
505 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
506 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
506 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
507 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
508 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
507509
508510 const MyIntWrapper = struct {
509511 const Self = @This();
......@@ -519,12 +521,6 @@ test "error payload type is correctly resolved" {
519521}
520522
521523test "error union comptime caching" {
522 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
523 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
524 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
525 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
526 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
527
528524 const S = struct {
529525 fn quux(comptime arg: anytype) void {
530526 arg catch {};
......@@ -571,12 +567,6 @@ test "error set equality" {
571567 // This tests using stage2 logic (#11022)
572568 if (builtin.zig_backend == .stage1) return error.SkipZigTest;
573569
574 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
575 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
576 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
577 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
578 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
579
580570 const a = error{One};
581571 const b = error{One};
582572
......@@ -592,11 +582,7 @@ test "error set equality" {
592582}
593583
594584test "inferred error set equality" {
595 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
596 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
597 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
598 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
599 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
585 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
600586
601587 const S = struct {
602588 fn foo() !void {
test/behavior/type_info.zig-2
......@@ -209,10 +209,8 @@ test "type info: error set merged" {
209209 if (builtin.zig_backend == .stage1) return error.SkipZigTest;
210210
211211 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
212 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
213212 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
214213 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
215 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
216214
217215 const TestSet = error{ One, Two } || error{Three};
218216