[NFC] Move some of the runtime's compiler abstraction into Compiler.h

Author: rjmccall

include/swift/Basic/Compiler.h

@@ -34,10 +34,59 @@
 #define SWIFT_ASSUME(x)
 #endif
 
+/// Attributes.
+
 #if __has_attribute(constructor)
 #define SWIFT_CONSTRUCTOR __attribute__((constructor))
 #else
 #define SWIFT_CONSTRUCTOR
 #endif
 
+/// \macro SWIFT_GNUC_PREREQ
+/// Extend the default __GNUC_PREREQ even if glibc's features.h isn't
+/// available.
+#ifndef SWIFT_GNUC_PREREQ
+# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
+#  define SWIFT_GNUC_PREREQ(maj, min, patch) \
+    ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) + __GNUC_PATCHLEVEL__ >= \
+     ((maj) << 20) + ((min) << 10) + (patch))
+# elif defined(__GNUC__) && defined(__GNUC_MINOR__)
+#  define SWIFT_GNUC_PREREQ(maj, min, patch) \
+    ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) >= ((maj) << 20) + ((min) << 10))
+# else
+#  define SWIFT_GNUC_PREREQ(maj, min, patch) 0
+# endif
+#endif
+
+
+/// SWIFT_ATTRIBUTE_NOINLINE - On compilers where we have a directive to do so,
+/// mark a method "not for inlining".
+#if __has_attribute(noinline) || SWIFT_GNUC_PREREQ(3, 4, 0)
+#define SWIFT_ATTRIBUTE_NOINLINE __attribute__((noinline))
+#elif defined(_MSC_VER)
+#define SWIFT_ATTRIBUTE_NOINLINE __declspec(noinline)
+#else
+#define SWIFT_ATTRIBUTE_NOINLINE
+#endif
+
+/// SWIFT_ATTRIBUTE_ALWAYS_INLINE - On compilers where we have a directive to do
+/// so, mark a method "always inline" because it is performance sensitive. GCC
+/// 3.4 supported this but is buggy in various cases and produces unimplemented
+/// errors, just use it in GCC 4.0 and later.
+#if __has_attribute(always_inline) || SWIFT_GNUC_PREREQ(4, 0, 0)
+#define SWIFT_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
+#elif defined(_MSC_VER)
+#define SWIFT_ATTRIBUTE_ALWAYS_INLINE __forceinline
+#else
+#define SWIFT_ATTRIBUTE_ALWAYS_INLINE
+#endif
+
+#ifdef __GNUC__
+#define SWIFT_ATTRIBUTE_NORETURN __attribute__((noreturn))
+#elif defined(_MSC_VER)
+#define SWIFT_ATTRIBUTE_NORETURN __declspec(noreturn)
+#else
+#define SWIFT_ATTRIBUTE_NORETURN
+#endif
+
 #endif // SWIFT_BASIC_COMPILER_H

include/swift/Runtime/Config.h

@@ -17,71 +17,29 @@
 #ifndef SWIFT_RUNTIME_CONFIG_H
 #define SWIFT_RUNTIME_CONFIG_H
 
+#include "swift/Basic/Compiler.h"
 #include "swift/Runtime/CMakeConfig.h"
 
-/// \macro SWIFT_RUNTIME_GNUC_PREREQ
-/// Extend the default __GNUC_PREREQ even if glibc's features.h isn't
-/// available.
-#ifndef SWIFT_RUNTIME_GNUC_PREREQ
-# if defined(__GNUC__) && defined(__GNUC_MINOR__) && defined(__GNUC_PATCHLEVEL__)
-#  define SWIFT_RUNTIME_GNUC_PREREQ(maj, min, patch) \
-    ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) + __GNUC_PATCHLEVEL__ >= \
-     ((maj) << 20) + ((min) << 10) + (patch))
-# elif defined(__GNUC__) && defined(__GNUC_MINOR__)
-#  define SWIFT_RUNTIME_GNUC_PREREQ(maj, min, patch) \
-    ((__GNUC__ << 20) + (__GNUC_MINOR__ << 10) >= ((maj) << 20) + ((min) << 10))
-# else
-#  define SWIFT_RUNTIME_GNUC_PREREQ(maj, min, patch) 0
-# endif
-#endif
-
 /// SWIFT_RUNTIME_LIBRARY_VISIBILITY - If a class marked with this attribute is
 /// linked into a shared library, then the class should be private to the
 /// library and not accessible from outside it.  Can also be used to mark
 /// variables and functions, making them private to any shared library they are
 /// linked into.
 /// On PE/COFF targets, library visibility is the default, so this isn't needed.
-#if (__has_attribute(visibility) || SWIFT_RUNTIME_GNUC_PREREQ(4, 0, 0)) &&    \
+#if (__has_attribute(visibility) || SWIFT_GNUC_PREREQ(4, 0, 0)) &&    \
     !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(_WIN32)
 #define SWIFT_RUNTIME_LIBRARY_VISIBILITY __attribute__ ((visibility("hidden")))
 #else
 #define SWIFT_RUNTIME_LIBRARY_VISIBILITY
 #endif
 
-/// Attributes.
-/// SWIFT_RUNTIME_ATTRIBUTE_NOINLINE - On compilers where we have a directive to do so,
-/// mark a method "not for inlining".
-#if __has_attribute(noinline) || SWIFT_RUNTIME_GNUC_PREREQ(3, 4, 0)
-#define SWIFT_RUNTIME_ATTRIBUTE_NOINLINE __attribute__((noinline))
-#elif defined(_MSC_VER)
-#define SWIFT_RUNTIME_ATTRIBUTE_NOINLINE __declspec(noinline)
-#else
-#define SWIFT_RUNTIME_ATTRIBUTE_NOINLINE
-#endif
-
-/// SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE - On compilers where we have a directive to do
-/// so, mark a method "always inline" because it is performance sensitive. GCC
-/// 3.4 supported this but is buggy in various cases and produces unimplemented
-/// errors, just use it in GCC 4.0 and later.
-#if __has_attribute(always_inline) || SWIFT_RUNTIME_GNUC_PREREQ(4, 0, 0)
-#define SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE __attribute__((always_inline))
-#elif defined(_MSC_VER)
-#define SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE __forceinline
-#else
-#define SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE
-#endif
-
-#ifdef __GNUC__
-#define SWIFT_RUNTIME_ATTRIBUTE_NORETURN __attribute__((noreturn))
-#elif defined(_MSC_VER)
-#define SWIFT_RUNTIME_ATTRIBUTE_NORETURN __declspec(noreturn)
-#else
-#define SWIFT_RUNTIME_ATTRIBUTE_NORETURN
-#endif
+#define SWIFT_RUNTIME_ATTRIBUTE_NOINLINE SWIFT_ATTRIBUTE_NOINLINE
+#define SWIFT_RUNTIME_ATTRIBUTE_ALWAYS_INLINE SWIFT_ATTRIBUTE_ALWAYS_INLINE
+#define SWIFT_RUNTIME_ATTRIBUTE_NORETURN SWIFT_ATTRIBUTE_NORETURN
 
 /// SWIFT_RUNTIME_BUILTIN_TRAP - On compilers which support it, expands to an expression
 /// which causes the program to exit abnormally.
-#if __has_builtin(__builtin_trap) || SWIFT_RUNTIME_GNUC_PREREQ(4, 3, 0)
+#if __has_builtin(__builtin_trap) || SWIFT_GNUC_PREREQ(4, 3, 0)
 # define SWIFT_RUNTIME_BUILTIN_TRAP __builtin_trap()
 #elif defined(_MSC_VER)
 // The __debugbreak intrinsic is supported by MSVC, does not require forward