Skip to content

Commit 9aed128

Browse files
Revert "[WASM] Sync calling convention between C++ and Swift"
This reverts commit 662d7bd.
1 parent 68fd6d9 commit 9aed128

File tree

3 files changed

+1
-3
lines changed

3 files changed

+1
-3
lines changed

include/swift/Runtime/HeapObject.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ HeapObject* swift_allocEmptyBox();
137137
/// It may also prove worthwhile to have this use a custom CC
138138
/// which preserves a larger set of registers.
139139
SWIFT_RUNTIME_EXPORT
140-
SWIFT_CC(swift)
141140
HeapObject *swift_retain(HeapObject *object);
142141

143142
SWIFT_RUNTIME_EXPORT

include/swift/Runtime/RuntimeFunctions.def

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ FUNCTION(CopyPOD, swift_copyPOD, C_CC, AlwaysAvailable,
182182
EFFECT(NoEffect))
183183

184184
// void *swift_retain(void *ptr);
185-
FUNCTION(NativeStrongRetain, swift_retain, SwiftCC, AlwaysAvailable,
185+
FUNCTION(NativeStrongRetain, swift_retain, C_CC, AlwaysAvailable,
186186
RETURNS(RefCountedPtrTy),
187187
ARGS(RefCountedPtrTy),
188188
ATTRS(NoUnwind, FirstParamReturned, WillReturn),

stdlib/public/runtime/HeapObject.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ static HeapObject *_swift_retain_(HeapObject *object) {
354354
return object;
355355
}
356356

357-
SWIFT_CC(swift)
358357
HeapObject *swift::swift_retain(HeapObject *object) {
359358
#ifdef SWIFT_THREADING_NONE
360359
return swift_nonatomic_retain(object);

0 commit comments

Comments
 (0)