Vendor import of lldb trunk r291012:

https://llvm.org/svn/llvm-project/lldb/trunk@291012
This commit is contained in:
Dimitry Andric 2017-01-04 22:11:59 +00:00
parent 14f1b3e882
commit cce7c2b0d2
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/vendor/lldb/dist/; revision=311325
svn path=/vendor/lldb/lldb-trunk-r291012/dist/; revision=311335; tag=vendor/lldb/lldb-trunk-r291015
9 changed files with 212 additions and 211 deletions

View File

@ -141,7 +141,7 @@ function(add_lldb_executable name)
endif()
endif()
if(ARG_GENERATE_INSTALL AND NOT ARG_INCLUDE_IN_FRAMEWORK)
if(ARG_GENERATE_INSTALL AND NOT (ARG_INCLUDE_IN_FRAMEWORK AND LLDB_BUILD_FRAMEWORK ))
install(TARGETS ${name}
COMPONENT ${name}
RUNTIME DESTINATION bin)

View File

@ -115,7 +115,6 @@
23DDF226196C3EE600BB8417 /* CommandOptionValidators.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23DDF224196C3EE600BB8417 /* CommandOptionValidators.cpp */; };
23E2E5251D90373D006F38BB /* ArchSpecTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23E2E5161D903689006F38BB /* ArchSpecTest.cpp */; };
23E2E5271D903782006F38BB /* MinidumpParserTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23E2E51A1D9036F2006F38BB /* MinidumpParserTest.cpp */; };
23E2E5291D9037D9006F38BB /* SymbolFilePDBTests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23CB15141D66CF8700EDDDE1 /* SymbolFilePDBTests.cpp */; };
23E2E52B1D9037E6006F38BB /* ModuleCacheTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23CB15011D66CD8400EDDDE1 /* ModuleCacheTest.cpp */; };
23E2E5321D903832006F38BB /* BreakpointIDTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23E2E52D1D90382B006F38BB /* BreakpointIDTest.cpp */; };
23E2E5441D904913006F38BB /* MinidumpParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23E2E5371D9048FB006F38BB /* MinidumpParser.cpp */; };
@ -6920,7 +6919,6 @@
23E2E5251D90373D006F38BB /* ArchSpecTest.cpp in Sources */,
AF248A4D1DA71C77000B814D /* TestArm64InstEmulation.cpp in Sources */,
23CB15371D66DA9300EDDDE1 /* PythonTestSuite.cpp in Sources */,
23E2E5291D9037D9006F38BB /* SymbolFilePDBTests.cpp in Sources */,
23E2E5321D903832006F38BB /* BreakpointIDTest.cpp in Sources */,
23CB15381D66DA9300EDDDE1 /* PythonExceptionStateTests.cpp in Sources */,
23CB15391D66DA9300EDDDE1 /* DataExtractorTest.cpp in Sources */,

View File

@ -26,6 +26,14 @@ class LinuxCoreTestCase(TestBase):
_x86_64_regions = 5
_s390x_regions = 2
def setUp(self):
super(LinuxCoreTestCase, self).setUp()
self._initial_platform = lldb.DBG.GetSelectedPlatform()
def tearDown(self):
lldb.DBG.SetSelectedPlatform(self._initial_platform)
super(LinuxCoreTestCase, self).tearDown()
@skipIf(oslist=['windows'])
@skipIf(triple='^mips')
def test_i386(self):
@ -38,9 +46,7 @@ def test_x86_64(self):
"""Test that lldb can read the process information from an x86_64 linux core file."""
self.do_test("linux-x86_64", self._x86_64_pid, self._x86_64_regions)
# This seems to hang on non-s390x platforms for some reason. Disabling
# for now.
@skipIf(archs=no_match(['s390x']))
@skipIf(oslist=['windows'])
@skipIf(triple='^mips')
def test_s390x(self):
"""Test that lldb can read the process information from an s390x linux core file."""

View File

@ -18,6 +18,7 @@ class NoreturnUnwind(TestBase):
@skipIfWindows # clang-cl does not support gcc style attributes.
@expectedFailureAndroid(bugnumber="llvm.org/pr31192", archs=["x86_64"])
@expectedFailureAll(bugnumber="llvm.org/pr31192", oslist=['linux'], compiler="gcc", archs=['arm'])
def test(self):
"""Test that we can backtrace correctly with 'noreturn' functions on the stack"""
self.build()

View File

@ -2854,6 +2854,11 @@ bool RenderScriptRuntime::LoadModule(const lldb::ModuleSP &module_sp) {
module_desc.reset(new RSModuleDescriptor(module_sp));
if (module_desc->ParseRSInfo()) {
m_rsmodules.push_back(module_desc);
module_desc->WarnIfVersionMismatch(GetProcess()
->GetTarget()
.GetDebugger()
.GetAsyncOutputStream()
.get());
module_loaded = true;
}
if (module_loaded) {
@ -2923,6 +2928,25 @@ void RenderScriptRuntime::Update() {
}
}
void RSModuleDescriptor::WarnIfVersionMismatch(lldb_private::Stream *s) const {
if (!s)
return;
if (m_slang_version.empty() || m_bcc_version.empty()) {
s->PutCString("WARNING: Unknown bcc or slang (llvm-rs-cc) version; debug "
"experience may be unreliable");
s->EOL();
} else if (m_slang_version != m_bcc_version) {
s->Printf("WARNING: The debug info emitted by the slang frontend "
"(llvm-rs-cc) used to build this module (%s) does not match the "
"version of bcc used to generate the debug information (%s). "
"This is an unsupported configuration and may result in a poor "
"debugging experience; proceed with caution",
m_slang_version.c_str(), m_bcc_version.c_str());
s->EOL();
}
}
bool RSModuleDescriptor::ParsePragmaCount(llvm::StringRef *lines,
size_t n_lines) {
// Skip the pragma prototype line
@ -2990,6 +3014,22 @@ bool RSModuleDescriptor::ParseExportReduceCount(llvm::StringRef *lines,
return true;
}
bool RSModuleDescriptor::ParseVersionInfo(llvm::StringRef *lines,
size_t n_lines) {
// Skip the versionInfo line
++lines;
for (; n_lines--; ++lines) {
// We're only interested in bcc and slang versions, and ignore all other
// versionInfo lines
const auto kv_pair = lines->split(" - ");
if (kv_pair.first == "slang")
m_slang_version = kv_pair.second.str();
else if (kv_pair.first == "bcc")
m_bcc_version = kv_pair.second.str();
}
return true;
}
bool RSModuleDescriptor::ParseExportForeachCount(llvm::StringRef *lines,
size_t n_lines) {
// Skip the exportForeachCount line
@ -3054,7 +3094,8 @@ bool RSModuleDescriptor::ParseRSInfo() {
eExportReduce,
ePragma,
eBuildChecksum,
eObjectSlot
eObjectSlot,
eVersionInfo,
};
const auto rs_info_handler = [](llvm::StringRef name) -> int {
@ -3070,6 +3111,7 @@ bool RSModuleDescriptor::ParseRSInfo() {
// script
.Case("pragmaCount", ePragma)
.Case("objectSlotCount", eObjectSlot)
.Case("versionInfo", eVersionInfo)
.Default(-1);
};
@ -3108,6 +3150,9 @@ bool RSModuleDescriptor::ParseRSInfo() {
case ePragma:
success = ParsePragmaCount(line, n_lines);
break;
case eVersionInfo:
success = ParseVersionInfo(line, n_lines);
break;
default: {
if (log)
log->Printf("%s - skipping .rs.info field '%s'", __FUNCTION__,

View File

@ -203,6 +203,11 @@ struct RSReductionDescriptor {
};
class RSModuleDescriptor {
std::string m_slang_version;
std::string m_bcc_version;
bool ParseVersionInfo(llvm::StringRef *, size_t n_lines);
bool ParseExportForeachCount(llvm::StringRef *, size_t n_lines);
bool ParseExportVarCount(llvm::StringRef *, size_t n_lines);
@ -222,6 +227,8 @@ class RSModuleDescriptor {
void Dump(Stream &strm) const;
void WarnIfVersionMismatch(Stream *s) const;
const lldb::ModuleSP m_module;
std::vector<RSKernelDescriptor> m_kernels;
std::vector<RSGlobalDescriptor> m_globals;

View File

@ -1689,68 +1689,14 @@ Error NativeProcessLinux::GetMemoryRegionInfo(lldb::addr_t load_addr,
// Assume proc maps entries are in ascending order.
// FIXME assert if we find differently.
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
Error error;
if (m_supports_mem_region == LazyBool::eLazyBoolNo) {
// We're done.
error.SetErrorString("unsupported");
return error;
return Error("unsupported");
}
// If our cache is empty, pull the latest. There should always be at least
// one memory region
// if memory region handling is supported.
if (m_mem_region_cache.empty()) {
error = ProcFileReader::ProcessLineByLine(
GetID(), "maps", [&](const std::string &line) -> bool {
MemoryRegionInfo info;
const Error parse_error =
ParseMemoryRegionInfoFromProcMapsLine(line, info);
if (parse_error.Success()) {
m_mem_region_cache.push_back(info);
return true;
} else {
if (log)
log->Printf("NativeProcessLinux::%s failed to parse proc maps "
"line '%s': %s",
__FUNCTION__, line.c_str(), error.AsCString());
return false;
}
});
// If we had an error, we'll mark unsupported.
if (error.Fail()) {
m_supports_mem_region = LazyBool::eLazyBoolNo;
return error;
} else if (m_mem_region_cache.empty()) {
// No entries after attempting to read them. This shouldn't happen if
// /proc/{pid}/maps
// is supported. Assume we don't support map entries via procfs.
if (log)
log->Printf("NativeProcessLinux::%s failed to find any procfs maps "
"entries, assuming no support for memory region metadata "
"retrieval",
__FUNCTION__);
m_supports_mem_region = LazyBool::eLazyBoolNo;
error.SetErrorString("not supported");
return error;
}
if (log)
log->Printf("NativeProcessLinux::%s read %" PRIu64
" memory region entries from /proc/%" PRIu64 "/maps",
__FUNCTION__,
static_cast<uint64_t>(m_mem_region_cache.size()), GetID());
// We support memory retrieval, remember that.
m_supports_mem_region = LazyBool::eLazyBoolYes;
} else {
if (log)
log->Printf("NativeProcessLinux::%s reusing %" PRIu64
" cached memory region entries",
__FUNCTION__,
static_cast<uint64_t>(m_mem_region_cache.size()));
Error error = PopulateMemoryRegionCache();
if (error.Fail()) {
return error;
}
lldb::addr_t prev_base_address = 0;
@ -1760,7 +1706,7 @@ Error NativeProcessLinux::GetMemoryRegionInfo(lldb::addr_t load_addr,
// There can be a ton of regions on pthreads apps with lots of threads.
for (auto it = m_mem_region_cache.begin(); it != m_mem_region_cache.end();
++it) {
MemoryRegionInfo &proc_entry_info = *it;
MemoryRegionInfo &proc_entry_info = it->first;
// Sanity check assumption that /proc/{pid}/maps entries are ascending.
assert((proc_entry_info.GetRange().GetRangeBase() >= prev_base_address) &&
@ -1803,6 +1749,67 @@ Error NativeProcessLinux::GetMemoryRegionInfo(lldb::addr_t load_addr,
return error;
}
Error NativeProcessLinux::PopulateMemoryRegionCache() {
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
// If our cache is empty, pull the latest. There should always be at least
// one memory region if memory region handling is supported.
if (!m_mem_region_cache.empty()) {
if (log)
log->Printf("NativeProcessLinux::%s reusing %" PRIu64
" cached memory region entries",
__FUNCTION__,
static_cast<uint64_t>(m_mem_region_cache.size()));
return Error();
}
Error error = ProcFileReader::ProcessLineByLine(
GetID(), "maps", [&](const std::string &line) -> bool {
MemoryRegionInfo info;
const Error parse_error =
ParseMemoryRegionInfoFromProcMapsLine(line, info);
if (parse_error.Success()) {
m_mem_region_cache.emplace_back(
info, FileSpec(info.GetName().GetCString(), true));
return true;
} else {
if (log)
log->Printf("NativeProcessLinux::%s failed to parse proc maps "
"line '%s': %s",
__FUNCTION__, line.c_str(), parse_error.AsCString());
return false;
}
});
// If we had an error, we'll mark unsupported.
if (error.Fail()) {
m_supports_mem_region = LazyBool::eLazyBoolNo;
return error;
} else if (m_mem_region_cache.empty()) {
// No entries after attempting to read them. This shouldn't happen if
// /proc/{pid}/maps is supported. Assume we don't support map entries
// via procfs.
if (log)
log->Printf("NativeProcessLinux::%s failed to find any procfs maps "
"entries, assuming no support for memory region metadata "
"retrieval",
__FUNCTION__);
m_supports_mem_region = LazyBool::eLazyBoolNo;
error.SetErrorString("not supported");
return error;
}
if (log)
log->Printf("NativeProcessLinux::%s read %" PRIu64
" memory region entries from /proc/%" PRIu64 "/maps",
__FUNCTION__, static_cast<uint64_t>(m_mem_region_cache.size()),
GetID());
// We support memory retrieval, remember that.
m_supports_mem_region = LazyBool::eLazyBoolYes;
return Error();
}
void NativeProcessLinux::DoStopIDBumped(uint32_t newBumpId) {
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PROCESS));
if (log)
@ -2463,60 +2470,38 @@ Error NativeProcessLinux::FixupBreakpointPCAsNeeded(NativeThreadLinux &thread) {
Error NativeProcessLinux::GetLoadedModuleFileSpec(const char *module_path,
FileSpec &file_spec) {
Error error = PopulateMemoryRegionCache();
if (error.Fail())
return error;
FileSpec module_file_spec(module_path, true);
bool found = false;
file_spec.Clear();
ProcFileReader::ProcessLineByLine(
GetID(), "maps", [&](const std::string &line) {
SmallVector<StringRef, 16> columns;
StringRef(line).split(columns, " ", -1, false);
if (columns.size() < 6)
return true; // continue searching
FileSpec this_file_spec(columns[5].str(), false);
if (this_file_spec.GetFilename() != module_file_spec.GetFilename())
return true; // continue searching
file_spec = this_file_spec;
found = true;
return false; // we are done
});
if (!found)
return Error("Module file (%s) not found in /proc/%" PRIu64 "/maps file!",
module_file_spec.GetFilename().AsCString(), GetID());
return Error();
for (const auto &it : m_mem_region_cache) {
if (it.second.GetFilename() == module_file_spec.GetFilename()) {
file_spec = it.second;
return Error();
}
}
return Error("Module file (%s) not found in /proc/%" PRIu64 "/maps file!",
module_file_spec.GetFilename().AsCString(), GetID());
}
Error NativeProcessLinux::GetFileLoadAddress(const llvm::StringRef &file_name,
lldb::addr_t &load_addr) {
load_addr = LLDB_INVALID_ADDRESS;
Error error = ProcFileReader::ProcessLineByLine(
GetID(), "maps", [&](const std::string &line) -> bool {
StringRef maps_row(line);
Error error = PopulateMemoryRegionCache();
if (error.Fail())
return error;
SmallVector<StringRef, 16> maps_columns;
maps_row.split(maps_columns, StringRef(" "), -1, false);
if (maps_columns.size() < 6) {
// Return true to continue reading the proc file
return true;
}
if (maps_columns[5] == file_name) {
StringExtractor addr_extractor(maps_columns[0].str().c_str());
load_addr = addr_extractor.GetHexMaxU64(false, LLDB_INVALID_ADDRESS);
// Return false to stop reading the proc file further
return false;
}
// Return true to continue reading the proc file
return true;
});
return error;
FileSpec file(file_name, false);
for (const auto &it : m_mem_region_cache) {
if (it.second == file) {
load_addr = it.first.GetRange().GetRangeBase();
return Error();
}
}
return Error("No load address found for specified file.");
}
NativeThreadLinuxSP NativeProcessLinux::GetThreadByID(lldb::tid_t tid) {

View File

@ -119,7 +119,7 @@ class NativeProcessLinux : public NativeProcessProtocol {
ArchSpec m_arch;
LazyBool m_supports_mem_region;
std::vector<MemoryRegionInfo> m_mem_region_cache;
std::vector<std::pair<MemoryRegionInfo, FileSpec>> m_mem_region_cache;
lldb::tid_t m_pending_notification_tid;
@ -217,6 +217,8 @@ class NativeProcessLinux : public NativeProcessProtocol {
void ThreadWasCreated(NativeThreadLinux &thread);
void SigchldHandler();
Error PopulateMemoryRegionCache();
};
} // namespace process_linux

View File

@ -202,7 +202,6 @@ ELFLinuxPrStatus::ELFLinuxPrStatus() {
Error ELFLinuxPrStatus::Parse(DataExtractor &data, ArchSpec &arch) {
Error error;
ByteOrder byteorder = data.GetByteOrder();
if (GetSize(arch) > data.GetByteSize()) {
error.SetErrorStringWithFormat(
"NT_PRSTATUS size should be %zu, but the remaining bytes are: %" PRIu64,
@ -210,50 +209,36 @@ Error ELFLinuxPrStatus::Parse(DataExtractor &data, ArchSpec &arch) {
return error;
}
switch (arch.GetCore()) {
case ArchSpec::eCore_s390x_generic:
case ArchSpec::eCore_x86_64_x86_64:
data.ExtractBytes(0, sizeof(ELFLinuxPrStatus), byteorder, this);
break;
case ArchSpec::eCore_x86_32_i386:
case ArchSpec::eCore_x86_32_i486: {
// Parsing from a 32 bit ELF core file, and populating/reusing the structure
// properly, because the struct is for the 64 bit version
offset_t offset = 0;
si_signo = data.GetU32(&offset);
si_code = data.GetU32(&offset);
si_errno = data.GetU32(&offset);
// Read field by field to correctly account for endianess
// of both the core dump and the platform running lldb.
offset_t offset = 0;
si_signo = data.GetU32(&offset);
si_code = data.GetU32(&offset);
si_errno = data.GetU32(&offset);
pr_cursig = data.GetU16(&offset);
offset += 2; // pad
pr_cursig = data.GetU16(&offset);
offset += 2; // pad
pr_sigpend = data.GetU32(&offset);
pr_sighold = data.GetU32(&offset);
pr_sigpend = data.GetPointer(&offset);
pr_sighold = data.GetPointer(&offset);
pr_pid = data.GetU32(&offset);
pr_ppid = data.GetU32(&offset);
pr_pgrp = data.GetU32(&offset);
pr_sid = data.GetU32(&offset);
pr_pid = data.GetU32(&offset);
pr_ppid = data.GetU32(&offset);
pr_pgrp = data.GetU32(&offset);
pr_sid = data.GetU32(&offset);
pr_utime.tv_sec = data.GetU32(&offset);
pr_utime.tv_usec = data.GetU32(&offset);
pr_utime.tv_sec = data.GetPointer(&offset);
pr_utime.tv_usec = data.GetPointer(&offset);
pr_stime.tv_sec = data.GetU32(&offset);
pr_stime.tv_usec = data.GetU32(&offset);
pr_stime.tv_sec = data.GetPointer(&offset);
pr_stime.tv_usec = data.GetPointer(&offset);
pr_cutime.tv_sec = data.GetU32(&offset);
pr_cutime.tv_usec = data.GetU32(&offset);
pr_cutime.tv_sec = data.GetPointer(&offset);
pr_cutime.tv_usec = data.GetPointer(&offset);
pr_cstime.tv_sec = data.GetU32(&offset);
pr_cstime.tv_usec = data.GetU32(&offset);
pr_cstime.tv_sec = data.GetPointer(&offset);
pr_cstime.tv_usec = data.GetPointer(&offset);
break;
}
default:
error.SetErrorStringWithFormat("ELFLinuxPrStatus::%s Unknown architecture",
__FUNCTION__);
break;
}
return error;
}
@ -274,49 +259,37 @@ Error ELFLinuxPrPsInfo::Parse(DataExtractor &data, ArchSpec &arch) {
GetSize(arch), data.GetByteSize());
return error;
}
size_t size = 0;
offset_t offset = 0;
switch (arch.GetCore()) {
case ArchSpec::eCore_s390x_generic:
case ArchSpec::eCore_x86_64_x86_64:
data.ExtractBytes(0, sizeof(ELFLinuxPrPsInfo), byteorder, this);
break;
case ArchSpec::eCore_x86_32_i386:
case ArchSpec::eCore_x86_32_i486: {
// Parsing from a 32 bit ELF core file, and populating/reusing the structure
// properly, because the struct is for the 64 bit version
size_t size = 0;
offset_t offset = 0;
pr_state = data.GetU8(&offset);
pr_sname = data.GetU8(&offset);
pr_zomb = data.GetU8(&offset);
pr_nice = data.GetU8(&offset);
pr_flag = data.GetU32(&offset);
pr_uid = data.GetU16(&offset);
pr_gid = data.GetU16(&offset);
pr_pid = data.GetU32(&offset);
pr_ppid = data.GetU32(&offset);
pr_pgrp = data.GetU32(&offset);
pr_sid = data.GetU32(&offset);
size = 16;
data.ExtractBytes(offset, size, byteorder, pr_fname);
offset += size;
size = 80;
data.ExtractBytes(offset, size, byteorder, pr_psargs);
offset += size;
break;
}
default:
error.SetErrorStringWithFormat("ELFLinuxPrPsInfo::%s Unknown architecture",
__FUNCTION__);
break;
pr_state = data.GetU8(&offset);
pr_sname = data.GetU8(&offset);
pr_zomb = data.GetU8(&offset);
pr_nice = data.GetU8(&offset);
if (data.GetAddressByteSize() == 8) {
// Word align the next field on 64 bit.
offset += 4;
}
pr_flag = data.GetPointer(&offset);
// 16 bit on 32 bit platforms, 32 bit on 64 bit platforms
pr_uid = data.GetMaxU64(&offset, data.GetAddressByteSize() >> 1);
pr_gid = data.GetMaxU64(&offset, data.GetAddressByteSize() >> 1);
pr_pid = data.GetU32(&offset);
pr_ppid = data.GetU32(&offset);
pr_pgrp = data.GetU32(&offset);
pr_sid = data.GetU32(&offset);
size = 16;
data.ExtractBytes(offset, size, byteorder, pr_fname);
offset += size;
size = 80;
data.ExtractBytes(offset, size, byteorder, pr_psargs);
offset += size;
return error;
}
@ -329,7 +302,6 @@ ELFLinuxSigInfo::ELFLinuxSigInfo() {
Error ELFLinuxSigInfo::Parse(DataExtractor &data, const ArchSpec &arch) {
Error error;
ByteOrder byteorder = data.GetByteOrder();
if (GetSize(arch) > data.GetByteSize()) {
error.SetErrorStringWithFormat(
"NT_SIGINFO size should be %zu, but the remaining bytes are: %" PRIu64,
@ -337,27 +309,12 @@ Error ELFLinuxSigInfo::Parse(DataExtractor &data, const ArchSpec &arch) {
return error;
}
switch (arch.GetCore()) {
case ArchSpec::eCore_x86_64_x86_64:
data.ExtractBytes(0, sizeof(ELFLinuxPrStatus), byteorder, this);
break;
case ArchSpec::eCore_s390x_generic:
case ArchSpec::eCore_x86_32_i386:
case ArchSpec::eCore_x86_32_i486: {
// Parsing from a 32 bit ELF core file, and populating/reusing the structure
// properly, because the struct is for the 64 bit version
offset_t offset = 0;
si_signo = data.GetU32(&offset);
si_code = data.GetU32(&offset);
si_errno = data.GetU32(&offset);
break;
}
default:
error.SetErrorStringWithFormat("ELFLinuxSigInfo::%s Unknown architecture",
__FUNCTION__);
break;
}
// Parsing from a 32 bit ELF core file, and populating/reusing the structure
// properly, because the struct is for the 64 bit version
offset_t offset = 0;
si_signo = data.GetU32(&offset);
si_code = data.GetU32(&offset);
si_errno = data.GetU32(&offset);
return error;
}