Merge pull request #73604 from tbkka/tbkka-127839540-6.0

[6.0] Make SwiftValue == support unconditional

Author: tbkka

stdlib/public/runtime/SwiftValue.mm

@@ -430,11 +430,6 @@ - (BOOL)isEqual:(id)other {
     }
   }
 
-  if (runtime::bincompat::useLegacySwiftObjCHashing()) {
-    // Legacy behavior only proxies isEqual: for Hashable, not Equatable
-    return NO;
-  }
-
   if (auto equatableConformance = selfHeader->getEquatableConformance()) {
     if (auto selfEquatableBaseType = selfHeader->getEquatableBaseType()) {
       auto otherEquatableBaseType = otherHeader->getEquatableBaseType();
@@ -464,11 +459,6 @@ - (NSUInteger)hash {
 	    selfHeader->type, hashableConformance);
   }
 
-  if (runtime::bincompat::useLegacySwiftObjCHashing()) {
-    // Legacy behavior doesn't honor Equatable conformance, only Hashable
-    return (NSUInteger)self;
-  }
-
   // If Swift type is Equatable but not Hashable,
   // we have to return something here that is compatible
   // with the `isEqual:` above.

test/stdlib/BridgeEquatableToObjC.swift

@@ -32,12 +32,7 @@ BridgeEquatableToObjC.test("Bridge equatable struct") {
   let objcResult = objcA.isEqual(objcB)
 
   expectEqual(swiftResult, true)
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
-  // Apple platforms use old semantics for now...
-  expectEqual(objcResult, false)
-#else
   expectEqual(objcResult, true)
-#endif
 }
 
 BridgeEquatableToObjC.test("Bridge non-equatable struct") {

test/stdlib/SwiftValueNSObject.swift

@@ -90,12 +90,7 @@ func TestHashableEquals<T: Equatable>(_ e1: T, _ e2: T) {
 // This has not always been true for Equatable value types
 func TestEquatableEquals<T: Equatable>(_ e1: T, _ e2: T) {
   if e1 == e2 {
-#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS) || os(visionOS)
-    // Legacy: Swift Equatable is not used in ObjC
-    TestSwiftValueNSObjectNotEquals(e1 as AnyObject, e2 as AnyObject)
-#else
     TestSwiftValueNSObjectEquals(e1 as AnyObject, e2 as AnyObject)
-#endif
   } else {
     TestSwiftValueNSObjectNotEquals(e1 as AnyObject, e2 as AnyObject)
   }
@@ -114,14 +109,8 @@ func TestHashable<T: Hashable>(_ h: T)
 // Test Obj-C hashValue for Swift types that are Equatable but not Hashable
 func TestEquatableHash<T: Equatable>(_ e: T)
 {
-#if os(macOS) || os(iOS) || os(watchOS) || os(tvOS) || os(visionOS)
-  // Legacy behavior used the pointer value, which is
-  // incompatible with user-defined equality.
-  TestSwiftValueNSObjectDefaultHashValue(e as AnyObject)
-#else
   // New behavior uses a constant hash value in this case
   TestSwiftValueNSObjectHashValue(e as AnyObject, 1)
-#endif
 }
 
 func TestNonEquatableHash<T>(_ e: T)