intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-22 06:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb-vscode] Don't call SBValue.GetError after generating a summary.

Browse Source 
In some occasions, SBValue::GetError can invalidate its cached
`m_summary_str` member. This in turn invalidates any StringRef variables
pointing to it.

Differential Revision: https://reviews.llvm.org/D136890
This commit is contained in:
Jorge Gorbe Moya
2022-10-27 14:48:44 -07:00
parent 41ed9d0297
commit 7d4d25c42a
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
lldb/tools/lldb-vscode/JSONUtils.cpp
View File

@@ -132,27 +132,28 @@ std::vector<std::string> GetStrings(const llvm::json::Object *obj,
void SetValueForKey(lldb::SBValue &v, llvm::json::Object &object,
llvm::StringRef key) {
llvm::StringRef value = v.GetValue();
llvm::StringRef summary = v.GetSummary();
llvm::StringRef type_name = v.GetType().GetDisplayTypeName();
lldb::SBError error = v.GetError();
std::string result;
llvm::raw_string_ostream strm(result);
lldb::SBError error = v.GetError();
if (!error.Success()) {
strm << "<error: " << error.GetCString() << ">";
} else if (!value.empty()) {
strm << value;
if (!summary.empty())
} else {
llvm::StringRef value = v.GetValue();
llvm::StringRef summary = v.GetSummary();
llvm::StringRef type_name = v.GetType().GetDisplayTypeName();
if (!value.empty()) {
strm << value;
if (!summary.empty())
strm << ' ' << summary;
} else if (!summary.empty()) {
strm << ' ' << summary;
} else if (!summary.empty()) {
strm << ' ' << summary;
} else if (!type_name.empty()) {
strm << type_name;
lldb::addr_t address = v.GetLoadAddress();
if (address != LLDB_INVALID_ADDRESS)
strm << " @ " << llvm::format_hex(address, 0);
} else if (!type_name.empty()) {
strm << type_name;
lldb::addr_t address = v.GetLoadAddress();
if (address != LLDB_INVALID_ADDRESS)
strm << " @ " << llvm::format_hex(address, 0);
}
}
strm.flush();
EmplaceSafeString(object, key, result);