Skip to content

Commit 66de146

Browse files
committed
Fix reversed logic, add the new stream type to the parsers ENUM_TO_STR switch.
1 parent 49bc821 commit 66de146

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

lldb/source/Plugins/Process/minidump/MinidumpParser.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -651,6 +651,7 @@ MinidumpParser::GetStreamTypeAsString(StreamType stream_type) {
651651
ENUM_TO_CSTR(FacebookAbortReason);
652652
ENUM_TO_CSTR(FacebookThreadName);
653653
ENUM_TO_CSTR(FacebookLogcat);
654+
ENUM_TO_CSTR(LLDBGenerated);
654655
}
655656
return "unknown stream type";
656657
}

lldb/source/Plugins/Process/minidump/ProcessMinidump.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,16 @@ ArchSpec ProcessMinidump::GetArchitecture() {
344344
return ArchSpec(triple);
345345
}
346346

347+
DataExtractor ProcessMinidump::GetAuxvData() {
348+
std::optional<llvm::ArrayRef<uint8_t>> auxv =
349+
m_minidump_parser->GetStream(StreamType::LinuxAuxv);
350+
if (!auxv)
351+
return DataExtractor();
352+
353+
return DataExtractor(auxv->data(), auxv->size(), GetByteOrder(),
354+
GetAddressByteSize(), GetAddressByteSize());
355+
}
356+
347357
bool ProcessMinidump::IsLLDBMinidump() {
348358
// If we've already checked, return the cached value
349359
if (m_is_lldb_generated.has_value())
@@ -377,16 +387,6 @@ DynamicLoader *ProcessMinidump::GetDynamicLoader() {
377387
return nullptr;
378388
}
379389

380-
DataExtractor ProcessMinidump::GetAuxvData() {
381-
std::optional<llvm::ArrayRef<uint8_t>> auxv =
382-
m_minidump_parser->GetStream(StreamType::LinuxAuxv);
383-
if (!auxv)
384-
return DataExtractor();
385-
386-
return DataExtractor(auxv->data(), auxv->size(), GetByteOrder(),
387-
GetAddressByteSize(), GetAddressByteSize());
388-
}
389-
390390
void ProcessMinidump::BuildMemoryRegions() {
391391
if (m_memory_regions)
392392
return;

0 commit comments

Comments
 (0)