Merge pull request #17467 from dmcyk/sr-7497

Author: swift-ci

stdlib/public/core/KeyPath.swift

@@ -59,6 +59,7 @@ public class AnyKeyPath: Hashable, _AppendKeyPath {
   ///   of this instance.
   @_effects(releasenone)
   final public func hash(into hasher: inout Hasher) {
+    ObjectIdentifier(type(of: self)).hash(into: &hasher)
     return withBuffer {
       var buffer = $0
       while true {
@@ -597,7 +598,6 @@ internal enum KeyPathComponent: Hashable {
 
   @_effects(releasenone)
   internal func hash(into hasher: inout Hasher) {
-    var hasher = hasher
     func appendHashFromArgument(
       _ argument: KeyPathComponent.ArgumentRef?
     ) {

test/stdlib/KeyPathImplementation.swift

@@ -657,7 +657,10 @@ keyPathImpl.test("equality") {
     }
 
   expectNotEqual(s_c_z_p_x, s_c_z_p_y)
+  expectNotEqual(s_c_z_p_x.hashValue, s_c_z_p_y.hashValue)
+
   expectNotEqual(s_c_z_p_y, s_c_z_p_x)
+  expectNotEqual(s_c_z_p_y.hashValue, s_c_z_p_x.hashValue)
 
   // Different path type
   let s_c_z_p = ReferenceWritableKeyPath<S<S<String>>, Point>
@@ -677,6 +680,24 @@ keyPathImpl.test("equality") {
   expectNotEqual(s_c_z_p_x, s_c_z_p)
   expectNotEqual(s_c_z_p, s_c_z_p_x)
 
+  let s_x = WritableKeyPath<S<String>, Int>
+    .build(capacityInBytes: MemoryLayout<Int>.size + 4) {
+      $0.addHeader(trivial: true, hasReferencePrefix: false)
+      $0.addStructComponent(offset: S<String>.x_offset)
+    }
+
+  let si_x = WritableKeyPath<S<Int>, Int>
+    .build(capacityInBytes: MemoryLayout<Int>.size + 4) {
+      $0.addHeader(trivial: true, hasReferencePrefix: false)
+      $0.addStructComponent(offset: S<Int>.x_offset)
+    }
+
+  expectNotEqual(s_x, si_x)
+  expectNotEqual(s_x.hashValue, si_x.hashValue)
+
+  expectNotEqual(si_x, s_x)
+  expectNotEqual(si_x.hashValue, s_x.hashValue)
+
   // Same path, no reference prefix
   let s_c_z_p_x_readonly = KeyPath<S<S<String>>, Double>
     .build(capacityInBytes: 7 * MemoryLayout<Int>.size + 4) {