Merge pull request #11133 from Vexu/stage2

stage2: misc fixes on the way to `std.debug.dumpCurrentStackTrace`

2 files changed, 24 insertions, 4 deletions

diff --git a/test/behavior/error.zig b/test/behavior/error.zig
index b3503051fb..e6c69f4abf 100644
--- a/test/behavior/error.zig
+++ b/test/behavior/error.zig
@@ -626,3 +626,26 @@ test "inferred error set equality" {
     try expect(BarError == BarError);
     try expect(BazError == BazError);
 }
+
+test "peer type resolution of two different error unions" {
+    const a: error{B}!void = {};
+    const b: error{A}!void = {};
+    var cond = true;
+    const err = if (cond) a else b;
+    try err;
+}
+
+test "coerce error set to the current inferred error set" {
+    const S = struct {
+        fn foo() !void {
+            var a = false;
+            if (a) {
+                const b: error{A}!void = error.A;
+                return b;
+            }
+            const b = error.A;
+            return b;
+        }
+    };
+    S.foo() catch {};
+}
diff --git a/test/behavior/switch.zig b/test/behavior/switch.zig
index d99998a34e..5c47a24b38 100644
--- a/test/behavior/switch.zig
+++ b/test/behavior/switch.zig
@@ -610,14 +610,11 @@ test "switch on pointer type" {
 }
 
 test "switch on error set with single else" {
-    if (builtin.zig_backend != .stage1) return error.SkipZigTest; // TODO
-
     const S = struct {
         fn doTheTest() !void {
             var some: error{Foo} = error.Foo;
             try expect(switch (some) {
-                else => |a| blk: {
-                    a catch {};
+                else => blk: {
                     break :blk true;
                 },
             });