Skip to content

Commit dd25fc3

Browse files
committed
Use StringRef instead of char* (NFC)
(cherry picked from commit 8b62429)
1 parent e7c56da commit dd25fc3

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

lldb/include/lldb/Expression/UserExpression.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,8 @@ class UserExpression : public Expression {
266266
0x1001; ///< ValueObject::GetError() returns this if there is no result
267267
/// from the expression.
268268

269-
const char *GetFixedText() {
270-
if (m_fixed_text.empty())
271-
return nullptr;
272-
return m_fixed_text.c_str();
269+
llvm::StringRef GetFixedText() {
270+
return m_fixed_text;
273271
}
274272

275273
protected:

lldb/source/Expression/UserExpression.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,7 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
262262
if (fixed_expression == nullptr)
263263
fixed_expression = &tmp_fixed_expression;
264264

265-
const char *fixed_text = user_expression_sp->GetFixedText();
266-
if (fixed_text != nullptr)
267-
fixed_expression->append(fixed_text);
265+
*fixed_expression = user_expression_sp->GetFixedText().str();
268266

269267
// If there is a fixed expression, try to parse it:
270268
if (!parse_success) {
@@ -293,8 +291,8 @@ UserExpression::Evaluate(ExecutionContext &exe_ctx,
293291
} else {
294292
// The fixed expression also didn't parse. Let's check for any new
295293
// Fix-Its we could try.
296-
if (fixed_expression_sp->GetFixedText()) {
297-
*fixed_expression = fixed_expression_sp->GetFixedText();
294+
if (!fixed_expression_sp->GetFixedText().empty()) {
295+
*fixed_expression = fixed_expression_sp->GetFixedText().str();
298296
} else {
299297
// Fixed expression didn't compile without a fixit, don't retry and
300298
// don't tell the user about it.

0 commit comments

Comments
 (0)