Skip to content

Cleanup uses of SWIFT_RUNTIME_EXPORT in implementation files #7127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2017
Merged

Cleanup uses of SWIFT_RUNTIME_EXPORT in implementation files #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stdlib/public/runtime/Casting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ std::string swift::nameForMetadata(const Metadata *type,
return result;
}

SWIFT_CC(swift) SWIFT_RUNTIME_EXPORT
SWIFT_CC(swift)
TwoWordPair<const char *, uintptr_t>::Return
swift::swift_getTypeName(const Metadata *type, bool qualified) {
using Pair = TwoWordPair<const char *, uintptr_t>;
Expand Down
5 changes: 2 additions & 3 deletions stdlib/public/runtime/HeapObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,8 @@ class BoxCacheEntry {

static SimpleGlobalCache<BoxCacheEntry> Boxes;

SWIFT_CC(swift) SWIFT_RUNTIME_EXPORT
BoxPair::Return
swift::swift_allocBox(const Metadata *type) {
SWIFT_CC(swift)
BoxPair::Return swift::swift_allocBox(const Metadata *type) {
return SWIFT_RT_ENTRY_REF(swift_allocBox)(type);
}

Expand Down
14 changes: 0 additions & 14 deletions stdlib/public/runtime/SwiftObject.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
return usesNativeSwiftReferenceCounting(_swift_getClassOfAllocated(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_unknownRetain_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -445,7 +444,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_retain(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_unknownRelease_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -455,7 +453,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_release(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_unknownRetain(void *object)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -466,7 +463,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_retain(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_unknownRelease(void *object)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -475,7 +471,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
return objc_release(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_unknownRetain_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -487,7 +482,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_retain(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_unknownRelease_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -497,7 +491,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_release(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_unknownRetain(void *object)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand All @@ -508,7 +501,6 @@ static bool usesNativeSwiftReferenceCounting_allocated(const void *object) {
objc_retain(static_cast<id>(object));
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_unknownRelease(void *object)
SWIFT_CC(DefaultCC_IMPL) {
if (isObjCTaggedPointerOrNull(object)) return;
Expand Down Expand Up @@ -538,7 +530,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
return (void*)(uintptr_t(object) & ~unTaggedNonNativeBridgeObjectBits);
}

SWIFT_RUNTIME_EXPORT
void *swift::swift_bridgeObjectRetain(void *object)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand Down Expand Up @@ -601,7 +592,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
#endif
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_bridgeObjectRelease(void *object)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand All @@ -620,7 +610,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
#endif
}

SWIFT_RUNTIME_EXPORT
void *swift::swift_bridgeObjectRetain_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand All @@ -645,7 +634,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
#endif
}

SWIFT_RUNTIME_EXPORT
void swift::swift_bridgeObjectRelease_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand All @@ -665,7 +653,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
#endif
}

SWIFT_RUNTIME_EXPORT
void *swift::swift_nonatomic_bridgeObjectRetain_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand All @@ -690,7 +677,6 @@ static bool isNonNative_unTagged_bridgeObject(void *object) {
#endif
}

SWIFT_RUNTIME_EXPORT
void swift::swift_nonatomic_bridgeObjectRelease_n(void *object, int n)
SWIFT_CC(DefaultCC_IMPL) {
#if SWIFT_OBJC_INTEROP
Expand Down