Merge branch 'master' of github.com:apple/swift-corelibs-foundation into json-encoder

# Conflicts:
#	Foundation.xcodeproj/project.pbxproj
#	Foundation/Data.swift

Author: bubski

CoreFoundation/Base.subproj/CFInternal.h

@@ -334,21 +334,17 @@ CF_PRIVATE Boolean __CFProcessIsRestricted();
 #define STACK_BUFFER_DECL(T, N, C) T N[C]
 #endif
 
-#ifdef __ANDROID__
-// Avoids crashes on Android
-// https://bugs.swift.org/browse/SR-2587
-// https://bugs.swift.org/browse/SR-2588
-// Seemed to be a linker/relocation? problem.
-// CFStrings using CONST_STRING_DECL() were not working
-// Applies reference to _NSCFConstantString's isa here
-// rather than using a linker option to create an alias.
-#define __CFConstantStringClassReference _T010Foundation19_NSCFConstantStringCN
-#endif
 
-CF_EXPORT void * __CFConstantStringClassReferencePtr;
 
 #if DEPLOYMENT_RUNTIME_SWIFT
 
+#if TARGET_OS_MAC
+#define __CFConstantStringClassReference _T015SwiftFoundation19_NSCFConstantStringCN
+#else
+#define __CFConstantStringClassReference _T010Foundation19_NSCFConstantStringCN
+#endif
+
+CF_EXPORT void * __CFConstantStringClassReferencePtr;
 CF_EXPORT void *__CFConstantStringClassReference[];
 
 #if __CF_BIG_ENDIAN__

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1005,14 +1005,6 @@ void __CFInitialize(void) {
         memset(__CFRuntimeObjCClassTable, 0, sizeof(__CFRuntimeObjCClassTable));
 
 #if DEPLOYMENT_RUNTIME_SWIFT
-        
-#ifndef __CFSwiftGetBaseClass
-#if TARGET_OS_LINUX
-#define __CFSwiftGetBaseClass _T010Foundation21__CFSwiftGetBaseClassyXlXpyF
-#elif TARGET_OS_MAC
-#define __CFSwiftGetBaseClass _T015SwiftFoundation21__CFSwiftGetBaseClassyXlXpyF
-#endif
-#endif
         extern uintptr_t __CFSwiftGetBaseClass();
 
         uintptr_t NSCFType = __CFSwiftGetBaseClass();
@@ -1115,13 +1107,6 @@ void __CFInitialize(void) {
 #endif
 
 #if DEPLOYMENT_RUNTIME_SWIFT
-#ifndef __CFInitializeSwift
-#if TARGET_OS_LINUX
-#define __CFInitializeSwift _T010Foundation19__CFInitializeSwiftyyF
-#elif TARGET_OS_MAC
-#define __CFInitializeSwift _T015SwiftFoundation014__CFInitializeA0yyF
-#endif
-#endif
         extern void __CFInitializeSwift();
         __CFInitializeSwift();
         __CFNumberInitialize(); /* needs to happen after Swift bridge is initialized */

CoreFoundation/Base.subproj/SymbolAliases

@@ -1,8 +1,3 @@
-
-
-# This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
-__T015SwiftFoundation19_NSCFConstantStringCN ___CFConstantStringClassReference
-
 _kCFCalendarIdentifierBuddhist		_kCFBuddhistCalendar
 _kCFCalendarIdentifierChinese		_kCFChineseCalendar
 _kCFCalendarIdentifierGregorian		_kCFGregorianCalendar

Foundation.xcodeproj/project.pbxproj

@@ -486,7 +486,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
 
     @_semantics("convertToObjectiveC")
     public func _bridgeToObjectiveC() -> NSCharacterSet {
-        return unsafeBitCast(_wrapped, to: NSCharacterSet.self)
+        return _wrapped
     }
 
     public static func _forceBridgeFromObjectiveC(_ input: NSCharacterSet, result: inout CharacterSet?) {