Add ConstString::IsNull() to tell between null vs. empty strings and fix usage in Mangled::GetDemangledName()

[sgraenitz]

Summary

IsEmpty() and operator bool() == false have equal semantics. Usage in Mangled::GetDemangledName() was incorrect. What it actually wants is a check for null-string. Split this off of D50071 and added a test to clarify usage.

[labath]

LGTM. Thanks for splitting this out.

lldb/trunk/include/lldb/Utility/ConstString.h

public:
   ///
   /// @return
   ///     @li \b true if the contained string is empty.
   ///     @li \b false if the contained string is not empty.
   //------------------------------------------------------------------
   bool IsEmpty() const { return m_string == nullptr || m_string[0] == '\0'; }
 
   //------------------------------------------------------------------
+  /// Test for null string.
+  ///
+  /// @return
+  ///     @li \b true if there is no string associated with this instance.
+  ///     @li \b false if there is a string associated with this instance.
+  //------------------------------------------------------------------
+  bool IsNull() const { return m_string == nullptr; }
+
+  //------------------------------------------------------------------
   /// Set the C string value.
   ///
   /// Set the string value in the object by uniquing the \a cstr string value
   /// in our global string pool.
   ///
   /// If the C string already exists in the global string pool, it finds the
   /// current entry and returns the existing value. If it doesn't exist, it is
   /// added to the string pool.

lldb/trunk/source/Core/Mangled.cpp

 // class will need to use this accessor if it wishes to decode the demangled
 // name. The result is cached and will be kept until a new string value is
 // supplied to this object, or until the end of the object's lifetime.
 //----------------------------------------------------------------------
 const ConstString &
 Mangled::GetDemangledName(lldb::LanguageType language) const {
   // Check to make sure we have a valid mangled name and that we haven't
   // already decoded our mangled name.
-  if (m_mangled && !m_demangled) {
+  if (m_mangled && m_demangled.IsNull()) {
     // We need to generate and cache the demangled name.
     static Timer::Category func_cat(LLVM_PRETTY_FUNCTION);
     Timer scoped_timer(func_cat, "Mangled::GetDemangledName (m_mangled = %s)",
                        m_mangled.GetCString());
 
     Log *log = lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_DEMANGLE);
 
     // Don't bother running anything that isn't mangled
#endif
       case eManglingSchemeNone:
         break;
       }
       if (demangled_name) {
         m_demangled.SetStringWithMangledCounterpart(demangled_name, m_mangled);
         free(demangled_name);
       }
     }
-    if (!m_demangled) {
+    if (m_demangled.IsNull()) {
       // Set the demangled string to the empty string to indicate we tried to
       // parse it once and failed.
       m_demangled.SetCString("");
     }
   }
 
   return m_demangled;
 }

lldb/trunk/unittests/Utility/ConstStringTest.cpp

TEST(ConstStringTest, MangledCounterpart) {
   EXPECT_EQ("bar", bar.GetStringRef());
 
   EXPECT_TRUE(bar.GetMangledCounterpart(counterpart));
   EXPECT_EQ("foo", counterpart.GetStringRef());
 
   EXPECT_TRUE(foo.GetMangledCounterpart(counterpart));
   EXPECT_EQ("bar", counterpart.GetStringRef());
 }
+
+TEST(ConstStringTest, NullAndEmptyStates) {
+  ConstString foo("foo");
+  EXPECT_FALSE(!foo);
+  EXPECT_FALSE(foo.IsEmpty());
+  EXPECT_FALSE(foo.IsNull());
+
+  ConstString empty("");
+  EXPECT_TRUE(!empty);
+  EXPECT_TRUE(empty.IsEmpty());
+  EXPECT_FALSE(empty.IsNull());
+
+  ConstString null;
+  EXPECT_TRUE(!null);
+  EXPECT_TRUE(null.IsEmpty());
+  EXPECT_TRUE(null.IsNull());
+}