[Runtime][Stdlib][Overlays] Rename various Objective-C classes and methods that would conflict when loading old Swift libraries into a process alongside ABI-stable libraries.

rdar://problem/35768222
This commit is contained in:
Mike Ash
2018-09-13 14:09:07 -04:00
parent c94bc1d7db
commit 798edb9d0e
42 changed files with 275 additions and 275 deletions

View File

@@ -151,8 +151,8 @@ void _swift_makeAnyHashableUpcastingToHashableBaseType(
#if SWIFT_OBJC_INTEROP
id srcObject;
memcpy(&srcObject, value, sizeof(id));
// Do we have a _SwiftValue?
if (_SwiftValue *srcSwiftValue = getAsSwiftValue(srcObject)) {
// Do we have a __SwiftValue?
if (__SwiftValue *srcSwiftValue = getAsSwiftValue(srcObject)) {
// If so, extract the boxed value and try to cast it.
const Metadata *unboxedType;
const OpaqueValue *unboxedValue;