---

yaml
---
r: 348397
b: refs/heads/master
c: b736d19
h: refs/heads/master
i:
  348395: b995850

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 27decb6b7869bedeb4f7275995f5981eba167cd2
+refs/heads/master: b736d19201e099e5d0fe8d9a5514919d5c5580d3
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/runtime/HeapObject.cpp

@@ -72,12 +72,6 @@ static inline bool isValidPointerForNativeRetain(const void *p) {
 #endif
 }
 
-HeapObject *swift::swift_allocObject(HeapMetadata const *metadata,
-                                     size_t requiredSize,
-                                     size_t requiredAlignmentMask) {
-  return _swift_allocObject(metadata, requiredSize, requiredAlignmentMask);
-}
-
 static HeapObject *_swift_allocObject_(HeapMetadata const *metadata,
                                        size_t requiredSize,
                                        size_t requiredAlignmentMask) {
@@ -98,7 +92,18 @@ static HeapObject *_swift_allocObject_(HeapMetadata const *metadata,
   return object;
 }
 
-auto swift::_swift_allocObject = _swift_allocObject_;
+HeapObject *swift::swift_allocObject(HeapMetadata const *metadata,
+                                     size_t requiredSize,
+                                     size_t requiredAlignmentMask) {
+  if (SWIFT_UNLIKELY(_swift_allocObject != _swift_allocObject_))
+    return _swift_allocObject(metadata, requiredSize, requiredAlignmentMask);
+  return _swift_allocObject_(metadata, requiredSize, requiredAlignmentMask);
+}
+
+HeapObject *(*swift::_swift_allocObject)(HeapMetadata const *metadata,
+                                         size_t requiredSize,
+                                         size_t requiredAlignmentMask) =
+  _swift_allocObject_;
 
 HeapObject *
 swift::swift_initStackObject(HeapMetadata const *metadata,
@@ -292,18 +297,20 @@ HeapObject *swift::swift_allocEmptyBox() {
 extern "C" LLVM_LIBRARY_VISIBILITY LLVM_ATTRIBUTE_NOINLINE LLVM_ATTRIBUTE_USED 
 void _swift_release_dealloc(HeapObject *object);
 
-HeapObject *swift::swift_retain(HeapObject *object) {
-  return _swift_retain(object);
-}
-
 static HeapObject *_swift_retain_(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_retain);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.increment(1);
   return object;
 }
 
-auto swift::_swift_retain = _swift_retain_;
+HeapObject *swift::swift_retain(HeapObject *object) {
+  if (SWIFT_UNLIKELY(_swift_retain != _swift_retain_))
+    return _swift_retain(object);
+  return _swift_retain_(object);
+}
+
+HeapObject *(*swift::_swift_retain)(HeapObject *object) = _swift_retain_;
 
 HeapObject *swift::swift_nonatomic_retain(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_nonatomic_retain);
@@ -312,18 +319,21 @@ HeapObject *swift::swift_nonatomic_retain(HeapObject *object) {
   return object;
 }
 
-HeapObject *swift::swift_retain_n(HeapObject *object, uint32_t n) {
-  return _swift_retain_n(object, n);
-}
-
 static HeapObject *_swift_retain_n_(HeapObject *object, uint32_t n) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_retain_n);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.increment(n);
   return object;
 }
 
-auto swift::_swift_retain_n = _swift_retain_n_;
+HeapObject *swift::swift_retain_n(HeapObject *object, uint32_t n) {
+  if (SWIFT_UNLIKELY(_swift_retain_n != _swift_retain_n_))
+    return _swift_retain_n(object, n);
+  return _swift_retain_n_(object, n);
+}
+
+HeapObject *(*swift::_swift_retain_n)(HeapObject *object, uint32_t n) =
+  _swift_retain_n_;
 
 HeapObject *swift::swift_nonatomic_retain_n(HeapObject *object, uint32_t n) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_nonatomic_retain_n);
@@ -332,35 +342,40 @@ HeapObject *swift::swift_nonatomic_retain_n(HeapObject *object, uint32_t n) {
   return object;
 }
 
-void swift::swift_release(HeapObject *object) {
-  _swift_release(object);
-}
-
 static void _swift_release_(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_release);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.decrementAndMaybeDeinit(1);
 }
 
-auto swift::_swift_release = _swift_release_;
+void swift::swift_release(HeapObject *object) {
+  if (SWIFT_UNLIKELY(_swift_release != _swift_release_))
+    _swift_release(object);
+  _swift_release_(object);
+}
+
+void (*swift::_swift_release)(HeapObject *object) = _swift_release_;
 
 void swift::swift_nonatomic_release(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_nonatomic_release);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.decrementAndMaybeDeinitNonAtomic(1);
 }
 
-void swift::swift_release_n(HeapObject *object, uint32_t n) {
-  return _swift_release_n(object, n);
-}
-
 static void _swift_release_n_(HeapObject *object, uint32_t n) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_release_n);
   if (isValidPointerForNativeRetain(object))
     object->refCounts.decrementAndMaybeDeinit(n);
 }
 
-auto swift::_swift_release_n = _swift_release_n_;
+void swift::swift_release_n(HeapObject *object, uint32_t n) {
+  if (SWIFT_UNLIKELY(_swift_release_n != _swift_release_n_))
+    return _swift_release_n(object, n);
+  return _swift_release_n_(object, n);
+}
+
+void (*swift::_swift_release_n)(HeapObject *object, uint32_t n) =
+  _swift_release_n_;
 
 void swift::swift_nonatomic_release_n(HeapObject *object, uint32_t n) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_nonatomic_release_n);
@@ -484,10 +499,6 @@ void swift::swift_nonatomic_unownedRelease_n(HeapObject *object, int n) {
   }
 }
 
-HeapObject *swift::swift_tryRetain(HeapObject *object) {
-  return _swift_tryRetain(object);
-}
-
 static HeapObject *_swift_tryRetain_(HeapObject *object) {
   SWIFT_RT_TRACK_INVOCATION(object, swift_tryRetain);
   if (!isValidPointerForNativeRetain(object))
@@ -497,7 +508,13 @@ static HeapObject *_swift_tryRetain_(HeapObject *object) {
   else return nullptr;
 }
 
-auto swift::_swift_tryRetain = _swift_tryRetain_;
+HeapObject *swift::swift_tryRetain(HeapObject *object) {
+  if (SWIFT_UNLIKELY(_swift_tryRetain != _swift_tryRetain_))
+    return _swift_tryRetain(object);
+  return _swift_tryRetain_(object);
+}
+
+HeapObject *(*swift::_swift_tryRetain)(HeapObject *object) = _swift_tryRetain_;
 
 bool swift::swift_isDeallocating(HeapObject *object) {
   if (!isValidPointerForNativeRetain(object))