Expand result with type char* to string in -data-evaluate-expression

[ki.stfu]

Summary

Expand result with type char* to string in -data-evaluate-expression.
was:

-data-evaluate-expression str
^done,value="0x00007fffffffece0"

now:

-data-evaluate-expression str
^done,value="0x00007fffffffece0 \"hello\""

All tests pass on Linux.

[abidh]

lgtm

test/tools/lldb-mi/data/TestMiData.py

def test_lldbmi_data_read_memory_bytes_local(self):
         line = line_number('main.cpp', '// BP_local_array_test_inner')
         self.runCmd('-break-insert main.cpp:%d' % line)
         self.expect(r'\^done,bkpt=\{number="1"')
         self.runCmd('-exec-run')
         self.expect(r'\^running')
         self.expect(r'\*stopped,reason="breakpoint-hit"')
 
         # Get address of local char[]
-        self.runCmd('-data-evaluate-expression &array')
+        self.runCmd('-data-evaluate-expression "(void *)&array"')
         self.expect(r'\^done,value="0x[0-9a-f]+"')
         addr = int(self.child.after.split('"')[1], 16)
         size = 4
 
         # Test that an unquoted hex literal address works
         self.runCmd('-data-read-memory-bytes %#x %d' % (addr, size))
         self.expect(r'\^done,memory=\[\{begin="0x0*%x",offset="0x0+",end="0x0*%x",contents="01020304"\}\]' % (addr, addr + size))
 

test/tools/lldb-mi/variable/TestMiVar.py

def test_lldbmi_eval(self):
         self.expect("\^done,value=\"12\"")
         self.runCmd("-var-show-attributes var5")
         self.expect("\^done,status=\"editable\"") #FIXME editable or not?
         self.runCmd("-var-list-children var5")
         self.expect("\^done,numchild=\"0\",has_more=\"0\"")
 
         # Print argument "argv[0]"
         self.runCmd("-data-evaluate-expression \"argv[0]\"")
-        self.expect("\^done,value=\"0x[0-9a-f]+\"")
+        self.expect("\^done,value=\"0x[0-9a-f]+ \\\\\\\".*?%s\\\\\\\"\"" % self.myexe)
         self.runCmd("-var-create var6 * \"argv[0]\"")
         self.expect("\^done,name=\"var6\",numchild=\"1\",value=\"0x[0-9a-f]+ \\\\\\\".*?%s\\\\\\\"\",type=\"const char \*\",thread-id=\"1\",has_more=\"0\"" % self.myexe)
         self.runCmd("-var-evaluate-expression var6")
         self.expect("\^done,value=\"0x[0-9a-f]+ \\\\\\\".*?%s\\\\\\\"\"" % self.myexe)
         self.runCmd("-var-show-attributes var6")
         self.expect("\^done,status=\"editable\"")
         self.runCmd("-var-list-children --all-values var6")
         # FIXME: The name below is not correct. It should be "var.*argv[0]".

tools/lldb-mi/MICmdCmdData.cpp

CMICmdCmdDataEvaluateExpression::Execute(void)
     m_bExpressionValid = (thread.GetNumFrames() > 0);
     if (!m_bExpressionValid)
         return MIstatus::success;
 
     lldb::SBFrame frame = thread.GetSelectedFrame();
     lldb::SBValue value = frame.EvaluateExpression(rExpression.c_str());
     if (!value.IsValid() || value.GetError().Fail())
         value = frame.FindVariable(rExpression.c_str());
-    const CMICmnLLDBUtilSBValue utilValue(value);
+    const CMICmnLLDBUtilSBValue utilValue(value, true);
     if (!utilValue.IsValid() || utilValue.IsValueUnknown())
     {
         m_bEvaluatedExpression = false;
         return MIstatus::success;
     }
     if (!utilValue.HasName())
     {
         if (HaveInvalidCharacterInExpression(rExpression, m_cExpressionInvalidChar))
if (rExpression.IsQuoted())
         return MIstatus::success;
     }
 
     MIuint64 nNumber = 0;
     if (CMICmnLLDBProxySBValue::GetValueAsUnsigned(value, nNumber) == MIstatus::success)
     {
         const lldb::ValueType eValueType = value.GetValueType();
         MIunused(eValueType);
-        m_strValue = utilValue.GetValue();
-        CMIUtilString strCString;
-        if (CMICmnLLDBProxySBValue::GetCString(value, strCString))
-        {
-            m_strValue += CMIUtilString::Format(" '%s'", strCString.c_str());
-        }
+        m_strValue = utilValue.GetValue().Escape().AddSlashes();
         return MIstatus::success;
     }
 
     // Composite type i.e. struct
     m_bCompositeVarType = true;
     const MIuint nChild = value.GetNumChildren();
     for (MIuint i = 0; i < nChild; i++)
     {