Merge remote-tracking branch 'origin/master' into llvm16

1 files changed, 19 insertions, 1 deletions

diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig
index ebca81be96..b82bfab99e 100644
--- a/test/behavior/basic.zig
+++ b/test/behavior/basic.zig
@@ -703,7 +703,7 @@ test "string concatenation" {
     comptime try expect(@TypeOf(a) == *const [12:0]u8);
     comptime try expect(@TypeOf(b) == *const [12:0]u8);
 
-    const len = mem.len(b);
+    const len = b.len;
     const len_with_null = len + 1;
     {
         var i: u32 = 0;
@@ -1125,3 +1125,21 @@ test "returning an opaque type from a function" {
     };
     try expect(S.foo(123).b == 123);
 }
+
+test "orelse coercion as function argument" {
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
+
+    const Loc = struct { start: i32 = -1 };
+    const Container = struct {
+        a: ?Loc = null,
+        fn init(a: Loc) @This() {
+            return .{
+                .a = a,
+            };
+        }
+    };
+    var optional: ?Loc = .{};
+    var foo = Container.init(optional orelse .{});
+    try expect(foo.a.?.start == -1);
+}