Skip to content

[lldb] Streamline ConstString -> std::string conversion (NFC) #79649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 26, 2024
Merged

[lldb] Streamline ConstString -> std::string conversion (NFC) #79649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions lldb/include/lldb/Utility/ConstString.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,14 @@ class ConstString {

// Implicitly convert \class ConstString instances to \class StringRef.
operator llvm::StringRef() const { return GetStringRef(); }
// Implicitly convert \class ConstString instances to \calss std::string_view.
operator std::string_view() const { return std::string_view(m_string, GetLength()); }

// Implicitly convert \class ConstString instances to \class std::string_view.
operator std::string_view() const {
return std::string_view(m_string, GetLength());
}

// Explicitly convert \class ConstString instances to \class std::string.
explicit operator std::string() const { return GetString(); }

/// Get the string value as a C string.
///
Expand All @@ -192,6 +198,9 @@ class ConstString {
return llvm::StringRef(m_string, GetLength());
}

/// Get the string value as a std::string
std::string GetString() const { return std::string(m_string, GetLength()); }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this necessary, if we have the explicit operator?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not necessary, it's more for consistency with how we already do things (similar to how StringRef has the explicit operator and the .str() method on the llvm side).


/// Get the string value as a C string.
///
/// Get the value of the contained string as a NULL terminated C string
Expand Down
14 changes: 14 additions & 0 deletions lldb/unittests/Utility/ConstStringTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,17 @@ TEST(ConstStringTest, CompareStringRef) {
EXPECT_TRUE(null == static_cast<const char *>(nullptr));
EXPECT_TRUE(null != "bar");
}

TEST(ConstStringTest, StringConversions) {
ConstString foo("foo");

// Member functions.
EXPECT_EQ(llvm::StringRef("foo"), foo.GetStringRef());
EXPECT_EQ(std::string("foo"), foo.GetString());
EXPECT_STREQ("foo", foo.AsCString());

// Conversion operators.
EXPECT_EQ(llvm::StringRef("foo"), llvm::StringRef(foo));
EXPECT_EQ(std::string("foo"), std::string_view(foo));
EXPECT_EQ(std::string("foo"), std::string(foo));
}