From 8d5ac6bdeaef032b2beaeea4bfa4a5bfac9b8263 Mon Sep 17 00:00:00 2001
From: mlugg <mlugg@mlugg.co.uk>
Date: Thu, 17 Oct 2024 09:09:35 +0100
Subject: Sema: add and improve some callconv compile errors

---
 src/Sema.zig | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/Sema.zig')

diff --git a/src/Sema.zig b/src/Sema.zig
index 1957b94b5c..00448c47ca 100644
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -10195,6 +10195,18 @@ fn finishFunc(
         return sema.failWithOwnedErrorMsg(block, msg);
     }
 
+    validate_incoming_stack_align: {
+        const a: u64 = switch (cc_resolved) {
+            inline else => |payload| if (@TypeOf(payload) != void and @hasField(@TypeOf(payload), "incoming_stack_alignment"))
+                payload.incoming_stack_alignment orelse break :validate_incoming_stack_align
+            else
+                break :validate_incoming_stack_align,
+        };
+        if (!std.math.isPowerOfTwo(a)) {
+            return sema.fail(block, cc_src, "calling convention incoming stack alignment '{d}' is not a power of two", .{a});
+        }
+    }
+
     switch (cc_resolved) {
         .x86_64_interrupt,
         .x86_interrupt,
@@ -10211,7 +10223,7 @@ fn finishFunc(
             return sema.fail(block, ret_ty_src, "function with calling convention '{s}' must return 'void' or 'noreturn'", .{@tagName(cc_resolved)});
         },
         .@"inline" => if (is_noinline) {
-            return sema.fail(block, cc_src, "'noinline' function cannot have callconv 'inline'", .{});
+            return sema.fail(block, cc_src, "'noinline' function cannot have calling convention 'inline'", .{});
         },
         else => {},
     }
@@ -10231,12 +10243,12 @@ fn finishFunc(
                     }
                 }
             };
-            return sema.fail(block, cc_src, "callconv '{s}' only available on architectures {}", .{
+            return sema.fail(block, cc_src, "calling convention '{s}' only available on architectures {}", .{
                 @tagName(cc_resolved),
                 ArchListFormatter{ .archs = allowed_archs },
             });
         },
-        .bad_backend => |bad_backend| return sema.fail(block, cc_src, "callconv '{s}' not supported by compiler backend '{s}'", .{
+        .bad_backend => |bad_backend| return sema.fail(block, cc_src, "calling convention '{s}' not supported by compiler backend '{s}'", .{
             @tagName(cc_resolved),
             @tagName(bad_backend),
         }),
-- 
cgit v1.2.3