Introduce callconv annotation

doc/docgen.zig

@@ -818,6 +818,7 @@ fn tokenizeAndPrintRaw(docgen_tokenizer: *Tokenizer, out: var, source_token: Tok
             .Keyword_resume,
             .Keyword_return,
             .Keyword_linksection,
+            .Keyword_callconv,
             .Keyword_stdcallcc,
             .Keyword_struct,
             .Keyword_suspend,

doc/langref.html.in

@@ -2829,7 +2829,7 @@ test "@tagName" {
       <p>
       By default, enums are not guaranteed to be compatible with the C ABI:
       </p>
-      {#code_begin|obj_err|parameter of type 'Foo' not allowed in function with calling convention 'ccc'#}
+      {#code_begin|obj_err|parameter of type 'Foo' not allowed in function with calling convention 'C'#}
 const Foo = enum { A, B, C };
 export fn entry(foo: Foo) void { }
       {#code_end#}

lib/std/builtin.zig

@@ -91,6 +91,25 @@ pub const Mode = enum {
     ReleaseSmall,
 };
 
+/// This data structure is used by the Zig language code generation and
+/// therefore must be kept in sync with the compiler implementation.
+pub const CallingConvention = enum {
+    Unspecified,
+    C,
+    Cold,
+    Naked,
+    Async,
+    Interrupt,
+    Signal,
+    Stdcall,
+    Fastcall,
+    Vectorcall,
+    Thiscall,
+    APCS,
+    AAPCS,
+    AAPCSVFP,
+};
+
 pub const TypeId = @TagType(TypeInfo);
 
 /// This data structure is used by the Zig language code generation and
@@ -253,17 +272,6 @@ pub const TypeInfo = union(enum) {
         decls: []Declaration,
     };
 
-    /// This data structure is used by the Zig language code generation and
-    /// therefore must be kept in sync with the compiler implementation.
-    pub const CallingConvention = enum {
-        Unspecified,
-        C,
-        Cold,
-        Naked,
-        Stdcall,
-        Async,
-    };
-
     /// This data structure is used by the Zig language code generation and
     /// therefore must be kept in sync with the compiler implementation.
     pub const FnArg = struct {
@@ -416,7 +424,7 @@ pub const CallOptions = struct {
 /// therefore must be kept in sync with the compiler implementation.
 pub const TestFn = struct {
     name: []const u8,
-    func: fn()anyerror!void,
+    func: fn () anyerror!void,
 };
 
 /// This function type is used by the Zig language code generation and

lib/std/debug.zig

@@ -2475,7 +2475,7 @@ extern fn handleSegfaultLinux(sig: i32, info: *const os.siginfo_t, ctx_ptr: *con
     os.abort();
 }
 
-stdcallcc fn handleSegfaultWindows(info: *windows.EXCEPTION_POINTERS) c_long {
+fn handleSegfaultWindows(info: *windows.EXCEPTION_POINTERS) callconv(.Stdcall) c_long {
     const exception_address = @ptrToInt(info.ExceptionRecord.ExceptionAddress);
     switch (info.ExceptionRecord.ExceptionCode) {
         windows.EXCEPTION_DATATYPE_MISALIGNMENT => panicExtra(null, exception_address, "Unaligned Memory Access", .{}),

lib/std/fs.zig

@@ -230,7 +230,7 @@ pub const AtomicFile = struct {
             b64_fs_encoder.encode(tmp_path_slice[dirname_component_len..tmp_path_len], &rand_buf);
 
             const file = my_cwd.createFileC(
-                tmp_path_slice, 
+                tmp_path_slice,
                 .{ .mode = mode, .exclusive = true },
             ) catch |err| switch (err) {
                 error.PathAlreadyExists => continue,

lib/std/mutex.zig

@@ -48,8 +48,8 @@ pub const Mutex = if (builtin.single_threaded)
             return self.tryAcquire() orelse @panic("deadlock detected");
         }
     }
-else if (builtin.os == .windows) 
-    // https://locklessinc.com/articles/keyed_events/
+else if (builtin.os == .windows)
+// https://locklessinc.com/articles/keyed_events/
     extern union {
         locked: u8,
         waiters: u32,
@@ -97,8 +97,8 @@ else if (builtin.os == .windows)
                         return Held{ .mutex = self };
                     }
 
-                // otherwise, try and update the waiting count.
-                // then unset the WAKE bit so that another unlocker can wake up a thread.
+                    // otherwise, try and update the waiting count.
+                    // then unset the WAKE bit so that another unlocker can wake up a thread.
                 } else if (@cmpxchgWeak(u32, &self.waiters, waiters, (waiters + WAIT) | 1, .Monotonic, .Monotonic) == null) {
                     const rc = windows.ntdll.NtWaitForKeyedEvent(handle, key, windows.FALSE, null);
                     assert(rc == 0);
@@ -118,7 +118,7 @@ else if (builtin.os == .windows)
 
                 while (true) : (SpinLock.loopHint(1)) {
                     const waiters = @atomicLoad(u32, &self.mutex.waiters, .Monotonic);
-                
+
                     // no one is waiting
                     if (waiters < WAIT) return;
                     // someone grabbed the lock and will do the wake instead
@@ -130,14 +130,14 @@ else if (builtin.os == .windows)
                     if (@cmpxchgWeak(u32, &self.mutex.waiters, waiters, waiters - WAIT + WAKE, .Release, .Monotonic) == null) {
                         const rc = windows.ntdll.NtReleaseKeyedEvent(handle, key, windows.FALSE, null);
                         assert(rc == 0);
-                        return;   
+                        return;
                     }
                 }
             }
         };
     }
 else if (builtin.link_libc or builtin.os == .linux)
-    // stack-based version of https://github.com/Amanieu/parking_lot/blob/master/core/src/word_lock.rs
+// stack-based version of https://github.com/Amanieu/parking_lot/blob/master/core/src/word_lock.rs
     struct {
         state: usize,
 
@@ -170,8 +170,8 @@ else if (builtin.link_libc or builtin.os == .linux)
 
         pub fn acquire(self: *Mutex) Held {
             return self.tryAcquire() orelse {
-               self.acquireSlow();
-               return Held{ .mutex = self };
+                self.acquireSlow();
+                return Held{ .mutex = self };
             };
         }
 
@@ -237,7 +237,7 @@ else if (builtin.link_libc or builtin.os == .linux)
 
         fn releaseSlow(self: *Mutex) void {
             @setCold(true);
-            
+
             // try and lock the LFIO queue to pop a node off,
             // stopping altogether if its already locked or the queue is empty
             var state = @atomicLoad(usize, &self.state, .Monotonic);
@@ -265,9 +265,10 @@ else if (builtin.link_libc or builtin.os == .linux)
         }
     }
 
-// for platforms without a known OS blocking
-// primitive, default to SpinLock for correctness
-else SpinLock;
+    // for platforms without a known OS blocking
+    // primitive, default to SpinLock for correctness
+else
+    SpinLock;
 
 const TestContext = struct {
     mutex: *Mutex,

lib/std/net.zig

@@ -451,11 +451,7 @@ pub fn getAddressList(allocator: *mem.Allocator, name: []const u8, port: u16) !*
             .next = null,
         };
         var res: *os.addrinfo = undefined;
-        switch (os.system.getaddrinfo(
-                name_c.ptr,
-                @ptrCast([*:0]const u8, port_c.ptr),
-                &hints,
-                &res)) {
+        switch (os.system.getaddrinfo(name_c.ptr, @ptrCast([*:0]const u8, port_c.ptr), &hints, &res)) {
             0 => {},
             c.EAI_ADDRFAMILY => return error.HostLacksNetworkAddresses,
             c.EAI_AGAIN => return error.TemporaryNameServerFailure,

lib/std/os/linux/arm-eabi.zig

@@ -97,15 +97,15 @@ pub extern fn getThreadPointer() usize {
     );
 }
 
-pub nakedcc fn restore() void {
+pub fn restore() callconv(.Naked) void {
     return asm volatile ("svc #0"
         :
         : [number] "{r7}" (@as(usize, SYS_sigreturn))
         : "memory"
     );
 }
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("svc #0"
         :
         : [number] "{r7}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/linux/arm64.zig

@@ -90,7 +90,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
 
 pub const restore = restore_rt;
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("svc #0"
         :
         : [number] "{x8}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/linux/i386.zig

@@ -102,15 +102,15 @@ pub fn socketcall(call: usize, args: [*]usize) usize {
 /// This matches the libc clone function.
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
 
-pub nakedcc fn restore() void {
+pub fn restore() callconv(.Naked) void {
     return asm volatile ("int $0x80"
         :
         : [number] "{eax}" (@as(usize, SYS_sigreturn))
         : "memory"
     );
 }
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("int $0x80"
         :
         : [number] "{eax}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/linux/mipsel.zig

@@ -144,15 +144,15 @@ pub fn syscall6(
 /// This matches the libc clone function.
 pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize;
 
-pub nakedcc fn restore() void {
+pub fn restore() callconv(.Naked) void {
     return asm volatile ("syscall"
         :
         : [number] "{$2}" (@as(usize, SYS_sigreturn))
         : "memory", "cc", "$7"
     );
 }
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("syscall"
         :
         : [number] "{$2}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/linux/riscv64.zig

@@ -89,7 +89,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
 
 pub const restore = restore_rt;
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("ecall"
         :
         : [number] "{x17}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/linux/x86_64.zig

@@ -90,7 +90,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: usize,
 
 pub const restore = restore_rt;
 
-pub nakedcc fn restore_rt() void {
+pub fn restore_rt() callconv(.Naked) void {
     return asm volatile ("syscall"
         :
         : [number] "{rax}" (@as(usize, SYS_rt_sigreturn))

lib/std/os/test.zig

@@ -166,7 +166,7 @@ test "sigaltstack" {
 // analyzed
 const dl_phdr_info = if (@hasDecl(os, "dl_phdr_info")) os.dl_phdr_info else c_void;
 
-export fn iter_fn(info: *dl_phdr_info, size: usize, data: ?*usize) i32 {
+extern fn iter_fn(info: *dl_phdr_info, size: usize, data: ?*usize) i32 {
     if (builtin.os == .windows or builtin.os == .wasi or builtin.os == .macosx)
         return 0;
 

lib/std/os/uefi/protocols/simple_text_input_protocol.zig

@@ -27,4 +27,3 @@ pub const SimpleTextInputProtocol = extern struct {
         .node = [_]u8{ 0x00, 0xa0, 0xc9, 0x69, 0x72, 0x3b },
     };
 };
-

lib/std/os/windows/advapi32.zig

@@ -1,23 +1,23 @@
 usingnamespace @import("bits.zig");
 
-pub extern "advapi32" stdcallcc fn RegOpenKeyExW(
+pub extern "advapi32" fn RegOpenKeyExW(
     hKey: HKEY,
     lpSubKey: LPCWSTR,
     ulOptions: DWORD,
     samDesired: REGSAM,
     phkResult: *HKEY,
-) LSTATUS;
+) callconv(.Stdcall) LSTATUS;
 
-pub extern "advapi32" stdcallcc fn RegQueryValueExW(
+pub extern "advapi32" fn RegQueryValueExW(
     hKey: HKEY,
     lpValueName: LPCWSTR,
     lpReserved: LPDWORD,
     lpType: LPDWORD,
     lpData: LPBYTE,
     lpcbData: LPDWORD,
-) LSTATUS;
+) callconv(.Stdcall) LSTATUS;
 
 // RtlGenRandom is known as SystemFunction036 under advapi32
 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa387694.aspx */
-pub extern "advapi32" stdcallcc fn SystemFunction036(output: [*]u8, length: ULONG) BOOL;
+pub extern "advapi32" fn SystemFunction036(output: [*]u8, length: ULONG) callconv(.Stdcall) BOOL;
 pub const RtlGenRandom = SystemFunction036;

lib/std/os/windows/bits.zig

@@ -892,7 +892,7 @@ pub const EXCEPTION_POINTERS = extern struct {
     ContextRecord: *c_void,
 };
 
-pub const VECTORED_EXCEPTION_HANDLER = stdcallcc fn (ExceptionInfo: *EXCEPTION_POINTERS) c_long;
+pub const VECTORED_EXCEPTION_HANDLER = fn (ExceptionInfo: *EXCEPTION_POINTERS) callconv(.Stdcall) c_long;
 
 pub const OBJECT_ATTRIBUTES = extern struct {
     Length: ULONG,