[stdlib] returning false in case where comparison cannot succeed in SwiftValue (#4813)

moiseev · web-flow · commit 46b860b5f894 · 2016-09-20T10:01:00.000-07:00
diff --git a/stdlib/public/runtime/SwiftValue.mm b/stdlib/public/runtime/SwiftValue.mm
@@ -305,7 +305,7 @@ - (BOOL)isEqual:(id)other {
   }
 
   if (![other isKindOfClass:getSwiftValueClass()]) {
-    return self == other;
+    return NO;
   }
 
   auto selfHeader = getSwiftValueHeader(self);
@@ -314,12 +314,12 @@ - (BOOL)isEqual:(id)other {
   auto hashableBaseType = selfHeader->getHashableBaseType();
   if (!hashableBaseType ||
       otherHeader->getHashableBaseType() != hashableBaseType) {
-    return self == other;
+    return NO;
   }
 
   auto hashableConformance = selfHeader->getHashableConformance();
   if (!hashableConformance) {
-    return self == other;
+    return NO;
   }
 
   return swift_stdlib_Hashable_isEqual_indirect(

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,7 @@ - (BOOL)isEqual:(id)other {`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`if (![other isKindOfClass:getSwiftValueClass()]) {`
`308`		`- return self == other;`
	`308`	`+ return NO;`
`309`	`309`	`}`
`310`	`310`
`311`	`311`	`auto selfHeader = getSwiftValueHeader(self);`
`@@ -314,12 +314,12 @@ - (BOOL)isEqual:(id)other {`
`314`	`314`	`auto hashableBaseType = selfHeader->getHashableBaseType();`
`315`	`315`	`if (!hashableBaseType \|\|`
`316`	`316`	`otherHeader->getHashableBaseType() != hashableBaseType) {`
`317`		`- return self == other;`
	`317`	`+ return NO;`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`auto hashableConformance = selfHeader->getHashableConformance();`
`321`	`321`	`if (!hashableConformance) {`
`322`		`- return self == other;`
	`322`	`+ return NO;`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`return swift_stdlib_Hashable_isEqual_indirect(`