commit aa5611f56df92ca78df874a3b751f906044460c1
author Zachary Turner <zturner@google.com> Sun Nov 13 03:29:46 2016 +0000
committer Zachary Turner <zturner@google.com> Sun Nov 13 03:29:46 2016 +0000
tree 2ea0cd20f0ff488617c617e0c8edc130304b79d6
parent 7a120c8b3df60a5da382f8f7baeaccdfa928bd5b

Change ValueObject creation functions to take StringRefs.

llvm-svn: 286744

lldb/source/Core/ValueObject.cpp

diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index edd5490..cd6bc89 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -3605,32 +3605,33 @@
   return NULL;
 }
 
-lldb::ValueObjectSP ValueObject::CreateValueObjectFromExpression(
-    const char *name, const char *expression, const ExecutionContext &exe_ctx) {
+lldb::ValueObjectSP
+ValueObject::CreateValueObjectFromExpression(llvm::StringRef name,
+                                             llvm::StringRef expression,
+                                             const ExecutionContext &exe_ctx) {
   return CreateValueObjectFromExpression(name, expression, exe_ctx,
                                          EvaluateExpressionOptions());
 }
 
 lldb::ValueObjectSP ValueObject::CreateValueObjectFromExpression(
-    const char *name, const char *expression, const ExecutionContext &exe_ctx,
-    const EvaluateExpressionOptions &options) {
+    llvm::StringRef name, llvm::StringRef expression,
+    const ExecutionContext &exe_ctx, const EvaluateExpressionOptions &options) {
   lldb::ValueObjectSP retval_sp;
   lldb::TargetSP target_sp(exe_ctx.GetTargetSP());
   if (!target_sp)
     return retval_sp;
-  if (!expression || !*expression)
+  if (expression.empty())
     return retval_sp;
   target_sp->EvaluateExpression(expression, exe_ctx.GetFrameSP().get(),
                                 retval_sp, options);
-  if (retval_sp && name && *name)
+  if (retval_sp && !name.empty())
     retval_sp->SetName(ConstString(name));
   return retval_sp;
 }
 
-lldb::ValueObjectSP
-ValueObject::CreateValueObjectFromAddress(const char *name, uint64_t address,
-                                          const ExecutionContext &exe_ctx,
-                                          CompilerType type) {
+lldb::ValueObjectSP ValueObject::CreateValueObjectFromAddress(
+    llvm::StringRef name, uint64_t address, const ExecutionContext &exe_ctx,
+    CompilerType type) {
   if (type) {
     CompilerType pointer_type(type.GetPointerType());
     if (pointer_type) {
@@ -3645,7 +3646,7 @@
             Value::eValueTypeLoadAddress);
         Error err;
         ptr_result_valobj_sp = ptr_result_valobj_sp->Dereference(err);
-        if (ptr_result_valobj_sp && name && *name)
+        if (ptr_result_valobj_sp && !name.empty())
           ptr_result_valobj_sp->SetName(ConstString(name));
       }
       return ptr_result_valobj_sp;
@@ -3655,14 +3656,14 @@
 }
 
 lldb::ValueObjectSP ValueObject::CreateValueObjectFromData(
-    const char *name, const DataExtractor &data,
+    llvm::StringRef name, const DataExtractor &data,
     const ExecutionContext &exe_ctx, CompilerType type) {
   lldb::ValueObjectSP new_value_sp;
   new_value_sp = ValueObjectConstResult::Create(
       exe_ctx.GetBestExecutionContextScope(), type, ConstString(name), data,
       LLDB_INVALID_ADDRESS);
   new_value_sp->SetAddressTypeOfChildren(eAddressTypeLoad);
-  if (new_value_sp && name && *name)
+  if (new_value_sp && !name.empty())
     new_value_sp->SetName(ConstString(name));
   return new_value_sp;
 }