Skip to content

Commit 05a50fd

Browse files
hughbehughbe
committed
Remove extern "C" from uses of SWIFT_RUNTIME_STDLIB_INTERFACE
1 parent 63cf2d5 commit 05a50fd

File tree

14 files changed

+60
-85
lines changed

14 files changed

+60
-85
lines changed

‎include/swift/Runtime/Metadata.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3489,7 +3489,6 @@ std::string nameForMetadata(const Metadata *type,
34893489
/// Return the superclass, if any. The result is nullptr for root
34903490
/// classes and class protocol types.
34913491
SWIFT_RUNTIME_STDLIB_INTERFACE
3492-
extern "C"
34933492
const Metadata *_swift_class_getSuperclass(const Metadata *theClass);
34943493

34953494
} // end namespace swift

‎stdlib/public/SwiftShims/GlobalObjects.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct _SwiftEmptyArrayStorage {
3636
struct _SwiftArrayBodyStorage body;
3737
};
3838

39-
extern SWIFT_RUNTIME_STDLIB_INTERFACE
39+
SWIFT_RUNTIME_STDLIB_INTERFACE
4040
struct _SwiftEmptyArrayStorage _swiftEmptyArrayStorage;
4141

4242
struct _SwiftUnsafeBitMap {
@@ -71,21 +71,21 @@ struct _SwiftEmptySetStorage {
7171
__swift_uintptr_t entries;
7272
};
7373

74-
extern SWIFT_RUNTIME_STDLIB_INTERFACE
74+
SWIFT_RUNTIME_STDLIB_INTERFACE
7575
struct _SwiftEmptyDictionaryStorage _swiftEmptyDictionaryStorage;
7676

77-
extern SWIFT_RUNTIME_STDLIB_INTERFACE
77+
SWIFT_RUNTIME_STDLIB_INTERFACE
7878
struct _SwiftEmptySetStorage _swiftEmptySetStorage;
7979

8080
struct _SwiftHashingSecretKey {
8181
__swift_uint64_t key0;
8282
__swift_uint64_t key1;
8383
};
8484

85-
extern SWIFT_RUNTIME_STDLIB_INTERFACE
85+
SWIFT_RUNTIME_STDLIB_INTERFACE
8686
struct _SwiftHashingSecretKey _swift_stdlib_Hashing_secretKey;
8787

88-
extern SWIFT_RUNTIME_STDLIB_INTERFACE
88+
SWIFT_RUNTIME_STDLIB_INTERFACE
8989
__swift_uint64_t _swift_stdlib_HashingDetail_fixedSeedOverride;
9090

9191
#ifdef __cplusplus

‎stdlib/public/SwiftShims/UnicodeShims.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace swift { extern "C" {
3030
#endif
3131

3232
SWIFT_RUNTIME_STDLIB_INTERFACE
33-
extern const __swift_uint8_t *_swift_stdlib_GraphemeClusterBreakPropertyTrie;
33+
const __swift_uint8_t *_swift_stdlib_GraphemeClusterBreakPropertyTrie;
3434

3535
struct _swift_stdlib_GraphemeClusterBreakPropertyTrieMetadataTy {
3636
unsigned BMPFirstLevelIndexBits;
@@ -55,11 +55,11 @@ struct _swift_stdlib_GraphemeClusterBreakPropertyTrieMetadataTy {
5555
};
5656

5757
SWIFT_RUNTIME_STDLIB_INTERFACE
58-
extern const struct _swift_stdlib_GraphemeClusterBreakPropertyTrieMetadataTy
58+
const struct _swift_stdlib_GraphemeClusterBreakPropertyTrieMetadataTy
5959
_swift_stdlib_GraphemeClusterBreakPropertyTrieMetadata;
6060

6161
SWIFT_RUNTIME_STDLIB_INTERFACE
62-
extern const __swift_uint16_t *
62+
const __swift_uint16_t *
6363
_swift_stdlib_ExtendedGraphemeClusterNoBoundaryRulesMatrix;
6464

6565
SWIFT_RUNTIME_STDLIB_INTERFACE

‎stdlib/public/runtime/AnyHashableSupport.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,15 +123,15 @@ const Metadata *swift::hashable_support::findHashableBaseType(
123123
}
124124

125125
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
126-
extern "C" void _swift_stdlib_makeAnyHashableUsingDefaultRepresentation(
126+
void _swift_stdlib_makeAnyHashableUsingDefaultRepresentation(
127127
const OpaqueValue *value,
128128
const void *anyHashableResultPointer,
129129
const Metadata *T,
130130
const WitnessTable *hashableWT
131131
);
132132

133133
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
134-
extern "C" void _swift_stdlib_makeAnyHashableUpcastingToHashableBaseType(
134+
void _swift_stdlib_makeAnyHashableUpcastingToHashableBaseType(
135135
OpaqueValue *value,
136136
const void *anyHashableResultPointer,
137137
const Metadata *type,

‎stdlib/public/runtime/Casting.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2983,7 +2983,6 @@ static id bridgeAnythingNonVerbatimToObjectiveC(OpaqueValue *src,
29832983
}
29842984

29852985
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
2986-
extern "C"
29872986
id _swift_bridgeAnythingNonVerbatimToObjectiveC(OpaqueValue *src,
29882987
const Metadata *srcType) {
29892988
return bridgeAnythingNonVerbatimToObjectiveC(src, srcType, /*consume*/ true);
@@ -3044,7 +3043,7 @@ findBridgeWitness(const Metadata *T) {
30443043
}
30453044

30463045
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3047-
extern "C" const Metadata *_swift_getBridgedNonVerbatimObjectiveCType(
3046+
const Metadata *_swift_getBridgedNonVerbatimObjectiveCType(
30483047
const Metadata *value, const Metadata *T
30493048
) {
30503049
// Classes and Objective-C existentials bridge verbatim.
@@ -3065,7 +3064,7 @@ extern "C" const Metadata *_swift_getBridgedNonVerbatimObjectiveCType(
30653064
// inout result: Any?
30663065
// )
30673066
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3068-
extern "C" void
3067+
void
30693068
_swift_bridgeNonVerbatimFromObjectiveCToAny(HeapObject *sourceValue,
30703069
OpaqueValue *destValue);
30713070

@@ -3075,7 +3074,7 @@ _swift_bridgeNonVerbatimFromObjectiveCToAny(HeapObject *sourceValue,
30753074
// inout result: NativeType?
30763075
// )
30773076
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3078-
extern "C" void
3077+
void
30793078
_swift_bridgeNonVerbatimBoxedValue(const OpaqueValue *sourceValue,
30803079
OpaqueValue *destValue,
30813080
const Metadata *nativeType);
@@ -3120,7 +3119,7 @@ static bool tryBridgeNonVerbatimFromObjectiveCUniversal(
31203119
// inout result: T?
31213120
// )
31223121
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3123-
extern "C" void
3122+
void
31243123
_swift_bridgeNonVerbatimFromObjectiveC(
31253124
HeapObject *sourceValue,
31263125
const Metadata *nativeType,
@@ -3163,7 +3162,7 @@ _swift_bridgeNonVerbatimFromObjectiveC(
31633162
// inout result: T?
31643163
// ) -> Bool
31653164
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3166-
extern "C" bool
3165+
bool
31673166
_swift_bridgeNonVerbatimFromObjectiveCConditional(
31683167
HeapObject *sourceValue,
31693168
const Metadata *nativeType,
@@ -3207,7 +3206,7 @@ _swift_bridgeNonVerbatimFromObjectiveCConditional(
32073206

32083207
// func _isBridgedNonVerbatimToObjectiveC<T>(x: T.Type) -> Bool
32093208
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3210-
extern "C" bool _swift_isBridgedNonVerbatimToObjectiveC(
3209+
bool _swift_isBridgedNonVerbatimToObjectiveC(
32113210
const Metadata *value, const Metadata *T
32123211
) {
32133212
assert(!swift_isClassOrObjCExistentialTypeImpl(T));
@@ -3219,7 +3218,7 @@ extern "C" bool _swift_isBridgedNonVerbatimToObjectiveC(
32193218

32203219
// func _isClassOrObjCExistential<T>(x: T.Type) -> Bool
32213220
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
3222-
extern "C" bool _swift_isClassOrObjCExistentialType(const Metadata *value,
3221+
bool _swift_isClassOrObjCExistentialType(const Metadata *value,
32233222
const Metadata *T) {
32243223
return swift_isClassOrObjCExistentialTypeImpl(T);
32253224
}

‎stdlib/public/runtime/Reflection.mm

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ explicit String(NSString *s)
164164

165165

166166
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
167-
extern "C"
168167
AnyReturn swift_MagicMirrorData_value(HeapObject *owner,
169168
const OpaqueValue *value,
170169
const Metadata *type) {
@@ -177,7 +176,6 @@ AnyReturn swift_MagicMirrorData_value(HeapObject *owner,
177176
return AnyReturn(result);
178177
}
179178
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
180-
extern "C"
181179
const Metadata *swift_MagicMirrorData_valueType(HeapObject *owner,
182180
const OpaqueValue *value,
183181
const Metadata *type) {
@@ -187,7 +185,6 @@ AnyReturn swift_MagicMirrorData_value(HeapObject *owner,
187185

188186
#if SWIFT_OBJC_INTEROP
189187
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
190-
extern "C"
191188
AnyReturn swift_MagicMirrorData_objcValue(HeapObject *owner,
192189
const OpaqueValue *value,
193190
const Metadata *type) {
@@ -205,7 +202,6 @@ AnyReturn swift_MagicMirrorData_objcValue(HeapObject *owner,
205202
#pragma clang diagnostic pop
206203

207204
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
208-
extern "C"
209205
const char *swift_OpaqueSummary(const Metadata *T) {
210206
switch (T->getKind()) {
211207
case MetadataKind::Class:
@@ -238,7 +234,6 @@ AnyReturn swift_MagicMirrorData_objcValue(HeapObject *owner,
238234
}
239235

240236
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
241-
extern "C"
242237
void swift_MagicMirrorData_summary(const Metadata *T, String *result) {
243238
switch (T->getKind()) {
244239
case MetadataKind::Class:
@@ -288,7 +283,6 @@ void swift_MagicMirrorData_summary(const Metadata *T, String *result) {
288283
}
289284

290285
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
291-
extern "C"
292286
const Metadata *swift_MagicMirrorData_objcValueType(HeapObject *owner,
293287
const OpaqueValue *value,
294288
const Metadata *type) {
@@ -341,7 +335,6 @@ static Mirror reflect(HeapObject *owner,
341335
// -- Tuple destructuring.
342336

343337
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
344-
extern "C"
345338
intptr_t swift_TupleMirror_count(HeapObject *owner,
346339
const OpaqueValue *value,
347340
const Metadata *type) {
@@ -353,7 +346,6 @@ intptr_t swift_TupleMirror_count(HeapObject *owner,
353346
/// \param owner passed at +1, consumed.
354347
/// \param value passed unowned.
355348
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
356-
extern "C"
357349
void swift_TupleMirror_subscript(String *outString,
358350
Mirror *outMirror,
359351
intptr_t i,
@@ -476,7 +468,6 @@ static bool loadSpecialReferenceStorage(HeapObject *owner,
476468
// -- Struct destructuring.
477469

478470
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
479-
extern "C"
480471
intptr_t swift_StructMirror_count(HeapObject *owner,
481472
const OpaqueValue *value,
482473
const Metadata *type) {
@@ -486,7 +477,6 @@ intptr_t swift_StructMirror_count(HeapObject *owner,
486477
}
487478

488479
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
489-
extern "C"
490480
void swift_StructMirror_subscript(String *outString,
491481
Mirror *outMirror,
492482
intptr_t i,
@@ -563,7 +553,6 @@ static void getEnumMirrorInfo(const OpaqueValue *value,
563553
}
564554

565555
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
566-
extern "C"
567556
const char *swift_EnumMirror_caseName(HeapObject *owner,
568557
const OpaqueValue *value,
569558
const Metadata *type) {
@@ -584,7 +573,6 @@ static void getEnumMirrorInfo(const OpaqueValue *value,
584573
}
585574

586575
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
587-
extern "C"
588576
const char *swift_EnumCaseName(OpaqueValue *value, const Metadata *type) {
589577
// Build a magic mirror. Unconditionally destroy the value at the end.
590578
const Metadata *mirrorType;
@@ -604,7 +592,6 @@ static void getEnumMirrorInfo(const OpaqueValue *value,
604592
}
605593

606594
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
607-
extern "C"
608595
intptr_t swift_EnumMirror_count(HeapObject *owner,
609596
const OpaqueValue *value,
610597
const Metadata *type) {
@@ -620,7 +607,6 @@ intptr_t swift_EnumMirror_count(HeapObject *owner,
620607
}
621608

622609
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
623-
extern "C"
624610
void swift_EnumMirror_subscript(String *outString,
625611
Mirror *outMirror,
626612
intptr_t i,
@@ -669,7 +655,6 @@ static Mirror getMirrorForSuperclass(const ClassMetadata *sup,
669655
const Metadata *type);
670656

671657
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
672-
extern "C"
673658
intptr_t swift_ClassMirror_count(HeapObject *owner,
674659
const OpaqueValue *value,
675660
const Metadata *type) {
@@ -688,7 +673,6 @@ intptr_t swift_ClassMirror_count(HeapObject *owner,
688673
/// \param owner passed at +1, consumed.
689674
/// \param value passed unowned.
690675
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
691-
extern "C"
692676
void swift_ClassMirror_subscript(String *outString,
693677
Mirror *outMirror,
694678
intptr_t i,
@@ -814,7 +798,6 @@ void swift_ClassMirror_subscript(String *outString,
814798
/// \param owner passed at +1, consumed.
815799
/// \param value passed unowned.
816800
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
817-
extern "C"
818801
intptr_t swift_ObjCMirror_count(HeapObject *owner,
819802
const OpaqueValue *value,
820803
const Metadata *type) {
@@ -850,7 +833,6 @@ static Mirror ObjC_getMirrorForSuperclass(Class sup,
850833
const Metadata *type);
851834

852835
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
853-
extern "C"
854836
void swift_ObjCMirror_subscript(String *outString,
855837
Mirror *outMirror,
856838
intptr_t i,
@@ -914,7 +896,7 @@ void swift_ObjCMirror_subscript(String *outString,
914896
}
915897

916898
SWIFT_CC(swift) SWIFT_RUNTIME_STDLIB_INTERFACE
917-
extern "C" id
899+
id
918900
swift_ClassMirror_quickLookObject(HeapObject *owner, const OpaqueValue *value,
919901
const Metadata *type) {
920902
id object = [*reinterpret_cast<const id *>(value) retain];

‎stdlib/public/stubs/CommandLine.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static char **_swift_stdlib_ProcessOverrideUnsafeArgv = nullptr;
3434
static int _swift_stdlib_ProcessOverrideUnsafeArgc = 0;
3535

3636
SWIFT_RUNTIME_STDLIB_INTERFACE
37-
extern "C" void _swift_stdlib_overrideUnsafeArgvArgc(char **argv, int argc) {
37+
void _swift_stdlib_overrideUnsafeArgvArgc(char **argv, int argc) {
3838
_swift_stdlib_ProcessOverrideUnsafeArgv = argv;
3939
_swift_stdlib_ProcessOverrideUnsafeArgc = argc;
4040
}
@@ -46,7 +46,7 @@ extern "C" char ***_NSGetArgv(void);
4646
extern "C" int *_NSGetArgc(void);
4747

4848
SWIFT_RUNTIME_STDLIB_INTERFACE
49-
extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
49+
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
5050
assert(outArgLen != nullptr);
5151

5252
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -59,7 +59,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
5959
}
6060
#elif defined(__linux__) || defined(__CYGWIN__)
6161
SWIFT_RUNTIME_STDLIB_INTERFACE
62-
extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
62+
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
6363
assert(outArgLen != nullptr);
6464

6565
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -93,7 +93,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
9393
#include <stdlib.h>
9494

9595
SWIFT_RUNTIME_STDLIB_INTERFACE
96-
extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
96+
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
9797
assert(outArgLen != nullptr);
9898

9999
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -112,7 +112,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
112112
#include <sys/sysctl.h>
113113

114114
SWIFT_RUNTIME_STDLIB_INTERFACE
115-
extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
115+
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
116116
assert(outArgLen != nullptr);
117117

118118
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
@@ -157,7 +157,7 @@ extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
157157
}
158158
#else // __ANDROID__; Add your favorite arch's command line arg grabber here.
159159
SWIFT_RUNTIME_STDLIB_INTERFACE
160-
extern "C" char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
160+
char ** _swift_stdlib_getUnsafeArgvArgc(int *outArgLen) {
161161
if (_swift_stdlib_ProcessOverrideUnsafeArgv) {
162162
*outArgLen = _swift_stdlib_ProcessOverrideUnsafeArgc;
163163
return _swift_stdlib_ProcessOverrideUnsafeArgv;

‎stdlib/public/stubs/GlobalObjects.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ namespace swift {
2626
// FIXME(ABI)#76 : does this declaration need SWIFT_RUNTIME_STDLIB_INTERFACE?
2727
// _direct type metadata for Swift._EmptyArrayStorage
2828
SWIFT_RUNTIME_STDLIB_INTERFACE
29-
extern "C" ClassMetadata CLASS_METADATA_SYM(s18_EmptyArrayStorage);
29+
ClassMetadata CLASS_METADATA_SYM(s18_EmptyArrayStorage);
3030

3131
// _direct type metadata for Swift._RawNativeDictionaryStorage
3232
SWIFT_RUNTIME_STDLIB_INTERFACE
33-
extern "C" ClassMetadata CLASS_METADATA_SYM(s27_RawNativeDictionaryStorage);
33+
ClassMetadata CLASS_METADATA_SYM(s27_RawNativeDictionaryStorage);
3434

3535
// _direct type metadata for Swift._RawNativeSetStorage
3636
SWIFT_RUNTIME_STDLIB_INTERFACE
37-
extern "C" ClassMetadata CLASS_METADATA_SYM(s20_RawNativeSetStorage);
37+
ClassMetadata CLASS_METADATA_SYM(s20_RawNativeSetStorage);
3838
} // namespace swift
3939

4040
swift::_SwiftEmptyArrayStorage swift::_swiftEmptyArrayStorage = {

‎stdlib/public/stubs/OptionalBridgingHelper.mm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ static id getSentinelForDepth(unsigned depth) {
8989
/// Return the sentinel object to use to represent `nil` for a given Optional
9090
/// type.
9191
SWIFT_RUNTIME_STDLIB_INTERFACE SWIFT_CC(swift)
92-
extern "C"
9392
id _swift_Foundation_getOptionalNilSentinelObject(const Metadata *Wrapped) {
9493
// Figure out the depth of optionality we're working with.
9594
unsigned depth = 1;

‎stdlib/public/stubs/Reflection.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
SWIFT_CC(swift)
1919
SWIFT_RUNTIME_STDLIB_INTERFACE
20-
extern "C" bool _swift_stdlib_NSObject_isKindOfClass(
20+
bool _swift_stdlib_NSObject_isKindOfClass(
2121
id NS_RELEASES_ARGUMENT _Nonnull object,
2222
NSString *NS_RELEASES_ARGUMENT _Nonnull className) {
2323
bool result = [object isKindOfClass:NSClassFromString(className)];

0 commit comments

Comments
 (0)