Add a lot of calling-convention annotations to the standard library / runtime.

The general rule here is that something needs to be SWIFT_CC(swift)
if it's just declared in Swift code using _silgen_name, as opposed to
importing something via a header.

Of course, SWIFT_CC(swift) expands to nothing by default for now, and
I haven't made an effort yet to add the indirect-result / context
parameter ABI attributes.  This is just a best-effort first pass.

I also took the opportunity to shift a few files to just implement
their shims header and to demote a few things to be private stdlib
interfaces.

Author: rjmccall

include/swift/Runtime/Config.h

@@ -30,6 +30,12 @@
 #endif
 #endif
 
+/// Does the current Swift platform use LLVM's intrinsic "swiftcall"
+/// calling convention for Swift functions?
+#ifndef SWIFT_USE_SWIFTCALL
+#define SWIFT_USE_SWIFTCALL 0
+#endif
+
 /// Does the current Swift platform allow information other than the
 /// class pointer to be stored in the isa field?  If so, when deriving
 /// the class pointer of an object, we must apply a
@@ -90,6 +96,18 @@
 #define SWIFT_CC_preserve_all  __attribute__((preserve_all))
 #define SWIFT_CC_c
 
+#if SWIFT_USE_SWIFTCALL
+#define SWIFT_CC_swift __attribute__((swiftcall))
+#define SWIFT_CONTEXT __attribute__((swift_context))
+#define SWIFT_ERROR_RESULT __attribute__((swift_error_result))
+#define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result))
+#else
+#define SWIFT_CC_swift
+#define SWIFT_CONTEXT
+#define SWIFT_ERROR_RESULT
+#define SWIFT_INDIRECT_RESULT
+#endif
+
 // Map a logical calling convention (e.g. RegisterPreservingCC) to LLVM calling
 // convention.
 #define SWIFT_LLVM_CC(CC) SWIFT_LLVM_CC_##CC

stdlib/private/StdlibUnittest/GetOSVersion.mm

@@ -12,6 +12,9 @@
 
 #include <Foundation/Foundation.h>
 
+#include "swift/Runtime/Config.h"
+
+SWIFT_CC(swift)
 extern "C" const char *
 swift_stdlib_getSystemVersionPlistProperty(const char *PropertyName) {
   // This function is implemented in Objective-C because Swift does not support

stdlib/private/StdlibUnittest/InterceptTraps.cpp

@@ -15,6 +15,8 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "swift/Runtime/Config.h"
+
 static void CrashCatcher(int Sig) {
   const char *Msg;
   switch (Sig) {
@@ -31,6 +33,7 @@ static void CrashCatcher(int Sig) {
   _exit(0);
 }
 
+SWIFT_CC(swift)
 extern "C" void swift_stdlib_installTrapInterceptor() {
   // Disable buffering on stdout so that everything is printed before crashing.
   setbuf(stdout, 0);

stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.cpp

@@ -10,5 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-extern "C" void *swift_stdlib_getPointer(void *x) { return x; }
+#include "swift/Runtime/Config.h"
+
+SWIFT_CC(swift)
+extern "C"
+void *swift_stdlib_getPointer(void *x) { return x; }
 

stdlib/private/SwiftPrivateLibcExtras/Subprocess.c

@@ -13,6 +13,8 @@
 // Spawn is not available on Android.
 #if !defined(__ANDROID__)
 
+#include "swift/Runtime/Config.h"
+
 // NOTE: preprocess away the availability information to allow use of
 // unsupported APIs on certain targets (i.e. tvOS)
 #define availability(...)
@@ -24,26 +26,31 @@
 extern char ***_NSGetEnviron(void);
 #endif // defined(__APPLE__)
 
+SWIFT_CC(swift)
 int swift_posix_spawn_file_actions_init(
     posix_spawn_file_actions_t *file_actions) {
   return posix_spawn_file_actions_init(file_actions);
 }
 
+SWIFT_CC(swift)
 int swift_posix_spawn_file_actions_destroy(
     posix_spawn_file_actions_t *file_actions) {
   return posix_spawn_file_actions_destroy(file_actions);
 }
 
+SWIFT_CC(swift)
 int swift_posix_spawn_file_actions_addclose(
     posix_spawn_file_actions_t *file_actions, int filedes) {
   return posix_spawn_file_actions_addclose(file_actions, filedes);
 }
 
+SWIFT_CC(swift)
 int swift_posix_spawn_file_actions_adddup2(
     posix_spawn_file_actions_t *file_actions, int filedes, int newfiledes) {
   return posix_spawn_file_actions_adddup2(file_actions, filedes, newfiledes);
 }
 
+SWIFT_CC(swift)
 int swift_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
                       const posix_spawn_file_actions_t *file_actions,
                       const posix_spawnattr_t *__restrict attrp,
@@ -53,6 +60,7 @@ int swift_posix_spawn(pid_t *__restrict pid, const char * __restrict path,
 }
 
 #if defined(__APPLE__)
+SWIFT_CC(swift)
 char ***swift_SwiftPrivateLibcExtras_NSGetEnviron(void) {
   return _NSGetEnviron();
 }

stdlib/public/Platform/Misc.c

@@ -15,58 +15,62 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-extern int
-_swift_Platform_open(const char *path, int oflag, mode_t mode) {
+#include "swift/Runtime/Config.h"
+
+SWIFT_CC(swift)
+extern int _swift_Platform_open(const char *path, int oflag, mode_t mode) {
   return open(path, oflag, mode);
 }
 
-extern int
-_swift_Platform_openat(int fd, const char *path, int oflag, mode_t mode) {
+SWIFT_CC(swift)
+extern int _swift_Platform_openat(int fd, const char *path, int oflag,
+                                  mode_t mode) {
   return openat(fd, path, oflag, mode);
 }
 
+SWIFT_CC(swift)
 extern sem_t *_swift_Platform_sem_open2(const char *name, int oflag) {
   return sem_open(name, oflag);
 }
 
+SWIFT_CC(swift)
 extern sem_t *_swift_Platform_sem_open4(const char *name, int oflag,
                                         mode_t mode, unsigned int value) {
   return sem_open(name, oflag, mode, value);
 }
 
-extern int
-_swift_Platform_fcntl(int fd, int cmd, int value) {
+SWIFT_CC(swift)
+extern int _swift_Platform_fcntl(int fd, int cmd, int value) {
   return fcntl(fd, cmd, value);
 }
 
-extern int
-_swift_Platform_fcntlPtr(int fd, int cmd, void* ptr) {
+SWIFT_CC(swift)
+extern int _swift_Platform_fcntlPtr(int fd, int cmd, void* ptr) {
   return fcntl(fd, cmd, ptr);
 }
 
 #if defined(__APPLE__)
 #define _REENTRANT
 #include <math.h>
 
-extern float
-_swift_Darwin_lgammaf_r(float x, int *psigngam) {
+SWIFT_CC(swift)
+extern float _swift_Darwin_lgammaf_r(float x, int *psigngam) {
   return lgammaf_r(x, psigngam);
 }
 
-extern double
-_swift_Darwin_lgamma_r(double x, int *psigngam) {
+SWIFT_CC(swift)
+extern double _swift_Darwin_lgamma_r(double x, int *psigngam) {
   return lgamma_r(x, psigngam);
 }
 
-extern long double
-_swift_Darwin_lgammal_r(long double x, int *psigngam) {
+SWIFT_CC(swift)
+extern long double _swift_Darwin_lgammal_r(long double x, int *psigngam) {
   return lgammal_r(x, psigngam);
 }
 #endif // defined(__APPLE__)
 
 #if defined(__FreeBSD__)
-extern char **
-_swift_FreeBSD_getEnv() {
+SWIFT_CC(swift) extern char **_swift_FreeBSD_getEnv() {
   extern char **environ;
   return environ;
 }

stdlib/public/SDK/Dispatch/Dispatch.mm

@@ -12,23 +12,25 @@
 
 #include <dispatch/dispatch.h>
 
-__attribute__((visibility("hidden")))
+#include "swift/Runtime/Config.h"
+
+SWIFT_CC(swift) __attribute__((visibility("hidden")))
 extern "C" dispatch_queue_attr_t 
 _swift_dispatch_queue_concurrent(void) {
   return DISPATCH_QUEUE_CONCURRENT;
 }
 
-__attribute__((visibility("hidden")))
-extern "C" dispatch_data_t
+SWIFT_CC(swift) __attribute__((visibility("hidden")))
+extern "C" SWIFT_CC(swift) dispatch_data_t
 _swift_dispatch_data_empty(void) {
   return dispatch_data_empty;
 }
 
-#define SOURCE(t)                               \
-  __attribute__((visibility("hidden")))         \
-  extern "C" dispatch_source_type_t             \
-  _swift_dispatch_source_type_##t(void) {       \
-    return DISPATCH_SOURCE_TYPE_##t;            \
+#define SOURCE(t)                                         \
+  SWIFT_CC(swift) __attribute__((visibility("hidden")))   \
+  extern "C" dispatch_source_type_t                       \
+  _swift_dispatch_source_type_##t(void) {                 \
+    return DISPATCH_SOURCE_TYPE_##t;                      \
   }
 
 SOURCE(DATA_ADD)

stdlib/public/SDK/Foundation/Thunks.mm

@@ -12,6 +12,9 @@
 
 #import <Foundation/Foundation.h>
 
+#include "swift/Runtime/Config.h"
+
+SWIFT_CC(swift)
 extern "C" void
 NS_Swift_NSUndoManager_registerUndoWithTargetHandler(
     id NS_RELEASES_ARGUMENT __nonnull self_,
@@ -28,6 +31,7 @@
 
 
 // -- NSCoder
+SWIFT_CC(swift)
 extern "C" NS_RETURNS_RETAINED __nullable id
 NS_Swift_NSCoder_decodeObject(id NS_RELEASES_ARGUMENT __nonnull self_,
                               NSError *__nullable *__nullable error) {
@@ -42,6 +46,7 @@
   return [result retain];
 }
 
+SWIFT_CC(swift)
 extern "C" NS_RETURNS_RETAINED __nullable id
 NS_Swift_NSCoder_decodeObjectForKey(id NS_RELEASES_ARGUMENT __nonnull self_,
                                     id NS_RELEASES_ARGUMENT __nonnull key,
@@ -58,6 +63,7 @@
   return [result retain];
 }
 
+SWIFT_CC(swift)
 extern "C" NS_RETURNS_RETAINED __nullable id
 NS_Swift_NSCoder_decodeObjectOfClassForKey(
     id NS_RELEASES_ARGUMENT __nonnull self_,
@@ -76,6 +82,7 @@
   return [result retain];
 }
 
+SWIFT_CC(swift)
 extern "C" NS_RETURNS_RETAINED __nullable id
 NS_Swift_NSCoder_decodeObjectOfClassesForKey(
     id NS_RELEASES_ARGUMENT __nonnull self_,
@@ -96,6 +103,7 @@
 }
 
 // -- NSKeyedUnarchiver
+SWIFT_CC(swift)
 extern "C" NS_RETURNS_RETAINED __nullable id
 NS_Swift_NSKeyedUnarchiver_unarchiveObjectWithData(
     Class Self_, id NS_RELEASES_ARGUMENT __nonnull data,

stdlib/public/SDK/GameplayKit/GameplayKit.mm

@@ -12,7 +12,9 @@
 
 #import <GameplayKit/GameplayKit.h>
 
-extern "C" NS_RETURNS_RETAINED GKComponent * __nullable
+#include "swift/Runtime/Config.h"
+
+extern "C" SWIFT_CC(swift) NS_RETURNS_RETAINED GKComponent * __nullable
 GK_Swift_GKEntity_componentForClass(
     id NS_RELEASES_ARGUMENT __nonnull self_,
     Class __nonnull componentClass) {
@@ -22,7 +24,7 @@
   return component;
 }
 
-extern "C" NS_RETURNS_RETAINED GKState * __nullable
+extern "C" SWIFT_CC(swift) NS_RETURNS_RETAINED GKState * __nullable
 GK_Swift_GKStateMachine_stateForClass(
     id NS_RELEASES_ARGUMENT __nonnull self_,
     Class __nonnull stateClass) {

stdlib/public/SDK/ObjectiveC/ObjectiveC.mm

@@ -12,16 +12,20 @@
 
 #include <objc/objc-api.h>
 
+#include "swift/Runtime/Config.h"
+
 OBJC_EXPORT
 void *objc_autoreleasePoolPush(void);
 
 OBJC_EXPORT
 void objc_autoreleasePoolPop(void *);
 
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
 extern "C" void *_swift_objc_autoreleasePoolPush(void) {
   return objc_autoreleasePoolPush();
 }
 
+SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
 extern "C" void _swift_objc_autoreleasePoolPop(void *context) {
   return objc_autoreleasePoolPop(context);
 }