Merge pull request #2480 from compnerd/attribute-spelling

stdlib: use the reserved attribute spellings

Author: gribozavr

stdlib/public/SDK/Dispatch/Dispatch.mm

@@ -14,23 +14,23 @@
 
 #include "swift/Runtime/Config.h"
 
-SWIFT_CC(swift) __attribute__((visibility("hidden")))
-extern "C" dispatch_queue_attr_t 
+SWIFT_CC(swift)
+__attribute__((__visibility__("hidden"))) extern "C" dispatch_queue_attr_t
 _swift_dispatch_queue_concurrent(void) {
   return DISPATCH_QUEUE_CONCURRENT;
 }
 
-SWIFT_CC(swift) __attribute__((visibility("hidden")))
-extern "C" SWIFT_CC(swift) dispatch_data_t
-_swift_dispatch_data_empty(void) {
+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)                                         \
-  SWIFT_CC(swift) __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/SwiftShims/LibcShims.h

@@ -48,11 +48,10 @@ __swift_size_t _swift_stdlib_fwrite_stdout(const void *ptr, __swift_size_t size,
                                            __swift_size_t nitems);
 
 // String handling <string.h>
-__attribute__((pure))
-SWIFT_RUNTIME_STDLIB_INTERFACE
-__swift_size_t _swift_stdlib_strlen(const char *s);
+__attribute__((__pure__)) SWIFT_RUNTIME_STDLIB_INTERFACE __swift_size_t
+_swift_stdlib_strlen(const char *s);
 
-__attribute__((pure))
+__attribute__((__pure__))
 SWIFT_RUNTIME_STDLIB_INTERFACE
 int _swift_stdlib_memcmp(const void *s1, const void *s2, __swift_size_t n);
 
@@ -66,9 +65,8 @@ SWIFT_RUNTIME_STDLIB_INTERFACE
 int _swift_stdlib_close(int fd);
 
 // Non-standard extensions
-__attribute__((const))
-SWIFT_RUNTIME_STDLIB_INTERFACE
-__swift_size_t _swift_stdlib_malloc_size(const void *ptr);
+__attribute__((__const__)) SWIFT_RUNTIME_STDLIB_INTERFACE __swift_size_t
+_swift_stdlib_malloc_size(const void *ptr);
 
 // Random number <random>
 SWIFT_RUNTIME_STDLIB_INTERFACE

stdlib/public/SwiftShims/RefCount.h

@@ -20,11 +20,11 @@
 #include "SwiftStdint.h"
 
 typedef struct {
-  __swift_uint32_t refCount __attribute__((unavailable));
+  __swift_uint32_t refCount __attribute__((__unavailable__));
 } StrongRefCount;
 
 typedef struct {
-  __swift_uint32_t weakRefCount __attribute__((unavailable));
+  __swift_uint32_t weakRefCount __attribute__((__unavailable__));
 } WeakRefCount;
 
 // not __cplusplus

stdlib/public/SwiftShims/UnicodeShims.h

@@ -58,32 +58,33 @@ extern const __swift_uint16_t *
 _swift_stdlib_ExtendedGraphemeClusterNoBoundaryRulesMatrix;
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
-__attribute__((pure))
-__swift_int32_t _swift_stdlib_unicode_compare_utf16_utf16(
-  const __swift_uint16_t *Left, __swift_int32_t LeftLength,
-  const __swift_uint16_t *Right, __swift_int32_t RightLength);
+__attribute__((__pure__)) __swift_int32_t
+_swift_stdlib_unicode_compare_utf16_utf16(const __swift_uint16_t *Left,
+                                          __swift_int32_t LeftLength,
+                                          const __swift_uint16_t *Right,
+                                          __swift_int32_t RightLength);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
-__attribute__((pure))
-__swift_int32_t _swift_stdlib_unicode_compare_utf8_utf16(
-  const char *Left, __swift_int32_t LeftLength,
-  const __swift_uint16_t *Right, __swift_int32_t RightLength);
+__attribute__((__pure__)) __swift_int32_t
+_swift_stdlib_unicode_compare_utf8_utf16(const char *Left,
+                                         __swift_int32_t LeftLength,
+                                         const __swift_uint16_t *Right,
+                                         __swift_int32_t RightLength);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
-__attribute__((pure))
-__swift_int32_t _swift_stdlib_unicode_compare_utf8_utf8(
-  const char *Left, __swift_int32_t LeftLength,
-  const char *Right, __swift_int32_t RightLength);
+__attribute__((__pure__)) __swift_int32_t
+_swift_stdlib_unicode_compare_utf8_utf8(const char *Left,
+                                        __swift_int32_t LeftLength,
+                                        const char *Right,
+                                        __swift_int32_t RightLength);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
-__attribute__((pure))
-__swift_intptr_t _swift_stdlib_unicode_hash(
-  const __swift_uint16_t *Str, __swift_int32_t Length);
+__attribute__((__pure__)) __swift_intptr_t
+_swift_stdlib_unicode_hash(const __swift_uint16_t *Str, __swift_int32_t Length);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
-__attribute__((pure))
-__swift_intptr_t _swift_stdlib_unicode_hash_ascii(
-  const char *Str, __swift_int32_t Length);
+__attribute__((__pure__)) __swift_intptr_t
+_swift_stdlib_unicode_hash_ascii(const char *Str, __swift_int32_t Length);
 
 SWIFT_RUNTIME_STDLIB_INTERFACE
 __swift_int32_t _swift_stdlib_unicode_strToUpper(

stdlib/public/SwiftShims/Visibility.h

@@ -38,13 +38,13 @@
 
 /// Attribute used to export symbols from the runtime.
 #if __MACH__
-# define SWIFT_RUNTIME_EXPORT __attribute__((visibility("default")))
+# define SWIFT_RUNTIME_EXPORT __attribute__((__visibility__("default")))
 #elif __ELF__
 // Use protected visibility for ELF, since we don't want Swift symbols to be
 // interposable. The relative relocations we form to metadata aren't
 // valid in ELF shared objects, and leaving them relocatable at load time
 // defeats the purpose of the relative references.
-# define SWIFT_RUNTIME_EXPORT __attribute__((visibility("protected")))
+# define SWIFT_RUNTIME_EXPORT __attribute__((__visibility__("protected")))
 #elif __CYGWIN__
 # define SWIFT_RUNTIME_EXPORT 
 #else

stdlib/public/runtime/ErrorObject.h

@@ -181,7 +181,7 @@ SWIFT_RUNTIME_EXPORT
 extern "C" void swift_willThrow(SwiftError *object);
 SWIFT_RUNTIME_EXPORT
 extern "C" void swift_unexpectedError(SwiftError *object)
-  __attribute__((noreturn));
+    __attribute__((__noreturn__));
 
 #if SWIFT_OBJC_INTEROP
 

stdlib/public/runtime/Errors.cpp

@@ -160,8 +160,8 @@ reportBacktrace(int *count)
 extern "C" {
 CRASH_REPORTER_CLIENT_HIDDEN
 struct crashreporter_annotations_t gCRAnnotations
-    __attribute__((section("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
-        CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0};
+__attribute__((__section__("__DATA," CRASHREPORTER_ANNOTATIONS_SECTION))) = {
+    CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0, 0};
 }
 
 // Report a message to any forthcoming crash log.

stdlib/public/runtime/HeapObject.cpp

@@ -277,11 +277,9 @@ OpaqueValue *swift::swift_projectBox(HeapObject *o) {
 }
 
 // Forward-declare this, but define it after swift_release.
-extern "C" LLVM_LIBRARY_VISIBILITY
-void _swift_release_dealloc(HeapObject *object)
-  SWIFT_CC(RegisterPreservingCC_IMPL)
-  __attribute__((noinline,used));
-
+extern "C" LLVM_LIBRARY_VISIBILITY void
+_swift_release_dealloc(HeapObject *object) SWIFT_CC(RegisterPreservingCC_IMPL)
+    __attribute__((__noinline__, __used__));
 
 SWIFT_RT_ENTRY_VISIBILITY
 extern "C"

stdlib/public/runtime/Leaks.h

@@ -29,16 +29,16 @@ struct HeapObject;
 
 SWIFT_RUNTIME_EXPORT
 extern "C" void swift_leaks_startTrackingObjects(const char *)
-    __attribute__((noinline, used));
+    __attribute__((__noinline__, __used__));
 SWIFT_RUNTIME_EXPORT
 extern "C" int swift_leaks_stopTrackingObjects(const char *)
-    __attribute__((noinline, used));
+    __attribute__((__noinline__, __used__));
 SWIFT_RUNTIME_EXPORT
 extern "C" void swift_leaks_startTrackingObject(swift::HeapObject *)
-    __attribute__((noinline, used));
+    __attribute__((__noinline__, __used__));
 SWIFT_RUNTIME_EXPORT
 extern "C" void swift_leaks_stopTrackingObject(swift::HeapObject *)
-    __attribute__((noinline, used));
+    __attribute__((__noinline__, __used__));
 
 #define SWIFT_LEAKS_START_TRACKING_OBJECT(obj)                                 \
   swift_leaks_startTrackingObject(obj)

stdlib/public/runtime/SwiftObject.mm

@@ -47,7 +47,7 @@
 using namespace swift;
 
 #if SWIFT_HAS_ISA_MASKING
-OBJC_EXPORT __attribute__((weak_import))
+OBJC_EXPORT __attribute__((__weak_import__))
 const uintptr_t objc_debug_isa_class_mask;
 
 static uintptr_t computeISAMask() {
@@ -75,9 +75,9 @@ static uintptr_t computeISAMask() {
 
 #if SWIFT_OBJC_INTEROP
 struct SwiftObject_s {
-  void *isa  __attribute__((unavailable));
-  uint32_t strongRefCount  __attribute__((unavailable));
-  uint32_t weakRefCount  __attribute__((unavailable));
+  void *isa __attribute__((__unavailable__));
+  uint32_t strongRefCount __attribute__((__unavailable__));
+  uint32_t weakRefCount __attribute__((__unavailable__));
 };
 
 static_assert(sizeof(SwiftObject_s) == sizeof(HeapObject),
@@ -88,10 +88,9 @@ static uintptr_t computeISAMask() {
               "SwiftObject must be trivially destructible");
 
 #if __has_attribute(objc_root_class)
-__attribute__((objc_root_class))
+__attribute__((__objc_root_class__))
 #endif
-SWIFT_RUNTIME_EXPORT
-@interface SwiftObject<NSObject> {
+SWIFT_RUNTIME_EXPORT @interface SwiftObject<NSObject> {
   SwiftObject_s header;
 }