[stdlib] Fix key path components hashing.

dmcyk · lorentey · commit 1aa78ba8a734 · 2018-06-25T19:48:23.000+01:00
Removes shadowed `hasher` argument in component hashing. (cherry picked from commit ef91e2e)
diff --git a/stdlib/public/core/KeyPath.swift b/stdlib/public/core/KeyPath.swift
@@ -597,7 +597,6 @@ internal enum KeyPathComponent: Hashable {
   
   @inlinable // FIXME(sil-serialize-all)
   internal func hash(into hasher: inout Hasher) {
-    var hasher = hasher
     func appendHashFromArgument(
       _ argument: KeyPathComponent.ArgumentRef?
     ) {
diff --git a/test/stdlib/KeyPathImplementation.swift b/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>

Original file line number	Diff line number	Diff line change
`@@ -657,7 +657,10 @@ keyPathImpl.test("equality") {`
`657`	`657`	`}`
`658`	`658`
`659`	`659`	`expectNotEqual(s_c_z_p_x, s_c_z_p_y)`
	`660`	`+ expectNotEqual(s_c_z_p_x.hashValue, s_c_z_p_y.hashValue)`
	`661`	`+`
`660`	`662`	`expectNotEqual(s_c_z_p_y, s_c_z_p_x)`
	`663`	`+ expectNotEqual(s_c_z_p_y.hashValue, s_c_z_p_x.hashValue)`
`661`	`664`
`662`	`665`	`// Different path type`
`663`	`666`	`let s_c_z_p = ReferenceWritableKeyPath<S<S<String>>, Point>`