Merge pull request #73347 from kubamracek/keypath-fix-equality

kubamracek · web-flow · commit 4e474d81dadb · 2024-04-30T19:05:58.000-07:00
[KeyPath] Fix regression in == on keypaths
diff --git a/stdlib/public/core/KeyPath.swift b/stdlib/public/core/KeyPath.swift
@@ -237,12 +237,10 @@ extension AnyKeyPath: Hashable {
     if a === b {
       return true
     }
-    /*
     // Short-circuit differently-typed key paths
     if type(of: a) != type(of: b) {
       return false
     }
-    */
     return a.withBuffer {
       var aBuffer = $0
       return b.withBuffer {
diff --git a/test/stdlib/KeyPath.swift b/test/stdlib/KeyPath.swift
@@ -327,6 +327,14 @@ keyPath.test("computed properties") {
   }
 }
 
+keyPath.test("equality") {
+  expectNotEqual(\Array<String>.isEmpty, \Substring.isEmpty)
+  expectNotEqual(\Array<String>.isEmpty, \Substring.isEmpty)
+  expectNotEqual(\Array<String>.isEmpty, \String.isEmpty)
+  expectNotEqual(\Array<String>.isEmpty, \Substring.last)
+  expectNotEqual(\Array<String>.isEmpty, \Array<Substring>.isEmpty)
+}
+
 class AB {
 }
 class ABC: AB, ABCProtocol {

Original file line number	Diff line number	Diff line change
`@@ -237,12 +237,10 @@ extension AnyKeyPath: Hashable {`
`237`	`237`	`if a === b {`
`238`	`238`	`return true`
`239`	`239`	`}`
`240`		`- /*`
`241`	`240`	`// Short-circuit differently-typed key paths`
`242`	`241`	`if type(of: a) != type(of: b) {`
`243`	`242`	`return false`
`244`	`243`	`}`
`245`		`- */`
`246`	`244`	`return a.withBuffer {`
`247`	`245`	`var aBuffer = $0`
`248`	`246`	`return b.withBuffer {`
Original file line number	Diff line number	Diff line change
`@@ -327,6 +327,14 @@ keyPath.test("computed properties") {`
`327`	`327`	`}`
`328`	`328`	`}`
`329`	`329`
	`330`	`+keyPath.test("equality") {`
	`331`	`+ expectNotEqual(\Array<String>.isEmpty, \Substring.isEmpty)`
	`332`	`+ expectNotEqual(\Array<String>.isEmpty, \Substring.isEmpty)`
	`333`	`+ expectNotEqual(\Array<String>.isEmpty, \String.isEmpty)`
	`334`	`+ expectNotEqual(\Array<String>.isEmpty, \Substring.last)`
	`335`	`+ expectNotEqual(\Array<String>.isEmpty, \Array<Substring>.isEmpty)`
	`336`	`+}`
	`337`	`+`
`330`	`338`	`class AB {`
`331`	`339`	`}`
`332`	`340`	`class ABC: AB, ABCProtocol {`