[ptrintenum] Cleanup equality method.

Author: gottesmm

include/swift/Basic/PointerIntEnum.h

@@ -160,12 +160,7 @@ class PointerIntEnum {
   bool isValid() const { return Storage != InvalidStorage; }
 
   bool operator==(const PointerIntEnum &Other) const {
-    // If this value is not valid, it can only equal another invalid
-    // PointerIntEnum.
-    if (!isValid())
-      return !Other.isValid();
-
-    // Otherwise just compare the raw storage.
+    // Just compare the raw storage.
     return Other.Storage == Storage;
   }
 

unittests/Basic/PointerIntEnumTest.cpp

@@ -234,6 +234,16 @@ TEST(PointerIntEnumTest, Comparisons) {
   // Test that pointers and indices compare differently.
   EXPECT_NE(IndexCase1, PtrCase1);
 
+  // Test comparison in between invalid and valid PointerIntEnums.
+  PointerIntEnumTy Invalid1;
+  PointerIntEnumTy Invalid2;
+  EXPECT_EQ(Invalid1, Invalid2);
+  EXPECT_NE(Invalid1, IndexCase1);
+  EXPECT_NE(Invalid1, PtrCase1);
+  EXPECT_NE(IndexCase1, Invalid1);
+  EXPECT_NE(PtrCase1, Invalid1);
+
+
   delete[] data2;
   delete[] data1;
 }