Skip to content

Commit 2265fda

Browse files
committed
Fix up reference to _NSCFConstantString, which comes from Foundation and is defined by the SymbolAliases file
1 parent defc025 commit 2265fda

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

CoreFoundation/Base.subproj/CFRuntime.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,9 @@ bool (*__CFObjCIsCollectable)(void *) = NULL;
208208
#endif
209209
#endif
210210

211-
#if !DEPLOYMENT_RUNTIME_SWIFT
211+
#if DEPLOYMENT_RUNTIME_SWIFT
212+
// The constant string class reference is set at link time to _NSCFConstantString
213+
#else
212214
#if !__CONSTANT_CFSTRINGS__ || DEPLOYMENT_TARGET_EMBEDDED_MINI
213215
// Compiler uses this symbol name; must match compiler built-in decl, so we use 'int'
214216
#if __LP64__

CoreFoundation/Base.subproj/DarwinSymbolAliases

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# OPENSOURCE: REVIEW
21

3-
__TMdC10Foundation19_NSCFConstantString ___CFConstantStringClassReference
2+
3+
# This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
4+
__TMdC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
5+
46
_kCFCalendarIdentifierBuddhist _kCFBuddhistCalendar
57
_kCFCalendarIdentifierChinese _kCFChineseCalendar
68
_kCFCalendarIdentifierGregorian _kCFGregorianCalendar

CoreFoundation/Base.subproj/SymbolAliases

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
# OPENSOURCE: REVIEW
21

2+
3+
# This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
34
__TMdC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
5+
46
_kCFCalendarIdentifierBuddhist _kCFBuddhistCalendar
57
_kCFCalendarIdentifierChinese _kCFChineseCalendar
68
_kCFCalendarIdentifierGregorian _kCFGregorianCalendar

0 commit comments

Comments
 (0)