Subzero: Fix an incorrect StringPool assert.

src/IceStringPool.h

 //===- subzero/src/IceStringPool.h - String pooling -------------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 94 matching lines @@
       return toString();
     return "";
   }
 
   bool operator==(const StringID &Other) const { return ID == Other.ID; }
   bool operator!=(const StringID &Other) const { return !(*this == Other); }
   bool operator<(const StringID &Other) const {
     const bool ThisHasString = hasStdString();
     const bool OtherHasString = Other.hasStdString();
     // Do a normal string comparison if both have strings.
     if (ThisHasString && OtherHasString)

[Jim Stichnoth, 2016/04/07 12:20:50]

Here we test for both being true.

       return this->toString() < Other.toString();
     // Use the ID as a tiebreaker if neither has a string.
     if (!ThisHasString && !OtherHasString)

[Jim Stichnoth, 2016/04/07 12:20:50]

Here we test for both being false.

       return ID < Other.ID;
     // If exactly one has a string, then that one comes first.
-    assert(!OtherHasString);
+    assert(ThisHasString != OtherHasString);

[Jim Stichnoth, 2016/04/07 12:20:50]

This is just meant to validate that one is true and the other is false.

     return ThisHasString;
   }
 
 private:
   static constexpr IDType InvalidID = 0;
   IDType ID = InvalidID;
 
   explicit StringID(const typename Traits::OwnerType *Owner)
       : ID(Traits::getStrings(Owner)->getNewID()) {}
   StringID(const typename Traits::OwnerType *Owner, const std::string &Value)
@@ skipping 33 matching lines @@
 template <typename T> struct hash<Ice::StringID<T>> {
   size_t operator()(const Ice::StringID<T> &Key) const {
     if (Key.hasStdString())
       return hash<std::string>()(Key.toString());
     return hash<Ice::StringPool::IDType>()(Key.getID());
   }
 };
 } // end of namespace std
 
 #endif // SUBZERO_SRC_ICESTRINGPOOL_H