summaryrefslogtreecommitdiffstats
path: root/lldb/source/Plugins/UnwindAssembly
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2016-11-16 21:15:24 +0000
committerZachary Turner <zturner@google.com>2016-11-16 21:15:24 +0000
commitc156427ded1dfa7686c90cc56ad16013a079a742 (patch)
treef4912beeebd9e7a04e9c20a8e05d64e25bde192d /lldb/source/Plugins/UnwindAssembly
parent725dc14bb21da8a01709a6b3370a658d071689dc (diff)
downloadbcm5719-llvm-c156427ded1dfa7686c90cc56ad16013a079a742.tar.gz
bcm5719-llvm-c156427ded1dfa7686c90cc56ad16013a079a742.zip
Don't allow direct access to StreamString's internal buffer.
This is a large API change that removes the two functions from StreamString that return a std::string& and a const std::string&, and instead provide one function which returns a StringRef. Direct access to the underlying buffer violates the concept of a "stream" which is intended to provide forward only access, and makes porting to llvm::raw_ostream more difficult in the future. Differential Revision: https://reviews.llvm.org/D26698 llvm-svn: 287152
Diffstat (limited to 'lldb/source/Plugins/UnwindAssembly')
-rw-r--r--lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp15
1 files changed, 7 insertions, 8 deletions
diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
index 40a3d27f9d2..0852f192203 100644
--- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@@ -1,5 +1,4 @@
-//===-- UnwindAssemblyInstEmulation.cpp --------------------------*- C++
-//-*-===//
+//===-- UnwindAssemblyInstEmulation.cpp --------------------------*- C++-*-===//
//
// The LLVM Compiler Infrastructure
//
@@ -221,7 +220,7 @@ bool UnwindAssemblyInstEmulation::GetNonCallSiteUnwindPlanFromAssembly(
FormatEntity::Parse("${frame.pc}: ", format);
inst->Dump(&strm, inst_list.GetMaxOpcocdeByteSize(), show_address,
show_bytes, NULL, NULL, NULL, &format, 0);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
last_condition = m_inst_emulator_ap->GetInstructionCondition();
@@ -276,7 +275,7 @@ bool UnwindAssemblyInstEmulation::GetNonCallSiteUnwindPlanFromAssembly(
strm.Printf("Resulting unwind rows for [0x%" PRIx64 " - 0x%" PRIx64 "):",
base_addr, base_addr + range.GetByteSize());
unwind_plan.Dump(strm, nullptr, base_addr);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
return unwind_plan.GetRowCount() > 0;
}
@@ -380,7 +379,7 @@ size_t UnwindAssemblyInstEmulation::ReadMemory(
", dst = %p, dst_len = %" PRIu64 ", context = ",
addr, dst, (uint64_t)dst_len);
context.Dump(strm, instruction);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
memset(dst, 0, dst_len);
return dst_len;
@@ -412,7 +411,7 @@ size_t UnwindAssemblyInstEmulation::WriteMemory(
data.Dump(&strm, 0, eFormatBytes, 1, dst_len, UINT32_MAX, addr, 0, 0);
strm.PutCString(", context = ");
context.Dump(strm, instruction);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
const bool cant_replace = false;
@@ -493,7 +492,7 @@ bool UnwindAssemblyInstEmulation::ReadRegister(EmulateInstruction *instruction,
"synthetic_value = %i, value = ",
reg_info->name, synthetic);
reg_value.Dump(&strm, reg_info, false, false, eFormatDefault);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
return true;
}
@@ -521,7 +520,7 @@ bool UnwindAssemblyInstEmulation::WriteRegister(
reg_value.Dump(&strm, reg_info, false, false, eFormatDefault);
strm.PutCString(", context = ");
context.Dump(strm, instruction);
- log->PutCString(strm.GetData());
+ log->PutString(strm.GetString());
}
SetRegisterValue(*reg_info, reg_value);
OpenPOWER on IntegriCloud