Merge pull request #11762 from Vexu/stage2

Stage2 fixes

1 files changed, 28 insertions, 0 deletions

diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig
index e887a1d4b6..32df664bae 100644
--- a/test/behavior/basic.zig
+++ b/test/behavior/basic.zig
@@ -977,3 +977,31 @@ test "weird array and tuple initializations" {
         .b = if (a) .{ .e = .a } else .{ .e = .b },
     };
 }
+
+test "array type comes from generic function" {
+    const S = struct {
+        fn A() type {
+            return struct { a: u8 = 0 };
+        }
+    };
+    const args = [_]S.A(){.{}};
+    _ = args;
+}
+
+test "generic function uses return type of other generic function" {
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
+
+    const S = struct {
+        fn call(
+            f: anytype,
+            args: anytype,
+        ) @TypeOf(@call(.{}, f, @as(@TypeOf(args), undefined))) {
+            return @call(.{}, f, args);
+        }
+
+        fn func(arg: anytype) @TypeOf(arg) {
+            return arg;
+        }
+    };
+    try std.testing.expect(S.call(S.func, .{@as(u8, 1)}) == 1);
+}