https://github.com/Jlalond created
https://github.com/llvm/llvm-project/pull/104497
Reapply #100443 and #101770. These were originally reverted due to a test
failure and an MSAN failure. I changed the test attribute to restrict to x86
(following the other existing tests). I could not reproduce the test or the
MSAN failure and no repo steps were provided.
>From 6f7bb2005f221dfd50e575aaf411ebad5042f1c5 Mon Sep 17 00:00:00 2001
From: Jacob Lalonde <jalalo...@fb.com>
Date: Mon, 5 Aug 2024 13:32:15 -0700
Subject: [PATCH 1/4] =?UTF-8?q?Reapply=20"[LLDB][SBSaveCore]=20Implement?=
=?UTF-8?q?=20a=20selectable=20threadlist=20for=20Core=E2=80=A6=20(#102018?=
=?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit accf5c9bb3b5fe88628a44062a5c0c2f903fca2c.
---
lldb/include/lldb/API/SBProcess.h | 1 +
lldb/include/lldb/API/SBSaveCoreOptions.h | 27 +++++++
lldb/include/lldb/API/SBThread.h | 3 +
lldb/include/lldb/Symbol/SaveCoreOptions.h | 15 +++-
lldb/include/lldb/Target/Process.h | 8 +-
lldb/source/API/SBSaveCoreOptions.cpp | 17 +++-
lldb/source/API/SBThread.cpp | 2 +
lldb/source/Core/PluginManager.cpp | 4 +
.../ObjectFile/Mach-O/ObjectFileMachO.cpp | 24 +++---
.../Minidump/MinidumpFileBuilder.cpp | 72 ++++++++---------
.../ObjectFile/Minidump/MinidumpFileBuilder.h | 10 ++-
.../Minidump/ObjectFileMinidump.cpp | 5 +-
lldb/source/Symbol/SaveCoreOptions.cpp | 80 +++++++++++++++++++
lldb/source/Target/Process.cpp | 30 +++++--
.../TestProcessSaveCoreMinidump.py | 55 +++++++++++++
.../TestSBSaveCoreOptions.py | 55 ++++++++++++-
.../sbsavecoreoptions/basic_minidump.yaml | 26 ++++++
.../basic_minidump_different_pid.yaml | 26 ++++++
18 files changed, 395 insertions(+), 65 deletions(-)
create mode 100644
lldb/test/API/python_api/sbsavecoreoptions/basic_minidump.yaml
create mode 100644
lldb/test/API/python_api/sbsavecoreoptions/basic_minidump_different_pid.yaml
diff --git a/lldb/include/lldb/API/SBProcess.h
b/lldb/include/lldb/API/SBProcess.h
index 778be795839901..1624e02070b1b2 100644
--- a/lldb/include/lldb/API/SBProcess.h
+++ b/lldb/include/lldb/API/SBProcess.h
@@ -586,6 +586,7 @@ class LLDB_API SBProcess {
friend class SBBreakpointCallbackBaton;
friend class SBBreakpointLocation;
friend class SBCommandInterpreter;
+ friend class SBSaveCoreOptions;
friend class SBDebugger;
friend class SBExecutionContext;
friend class SBFunction;
diff --git a/lldb/include/lldb/API/SBSaveCoreOptions.h
b/lldb/include/lldb/API/SBSaveCoreOptions.h
index e77496bd3a4a0d..df0aa561de4080 100644
--- a/lldb/include/lldb/API/SBSaveCoreOptions.h
+++ b/lldb/include/lldb/API/SBSaveCoreOptions.h
@@ -10,6 +10,10 @@
#define LLDB_API_SBSAVECOREOPTIONS_H
#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBFileSpec.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBThread.h"
namespace lldb {
@@ -53,6 +57,29 @@ class LLDB_API SBSaveCoreOptions {
/// \return The output file spec.
SBFileSpec GetOutputFile() const;
+ /// Set the process to save, or unset if supplied with a default constructed
+ /// process.
+ ///
+ /// \param process The process to save.
+ /// \return Success if process was set, otherwise an error
+ /// \note This will clear all process specific options if a different process
+ /// is specified than the current set process, either explicitly from this
+ /// api, or implicitly from any function that requires a process.
+ SBError SetProcess(lldb::SBProcess process);
+
+ /// Add a thread to save in the core file.
+ ///
+ /// \param thread The thread to save.
+ /// \note This will set the process if it is not already set, or return
+ /// and error if the SBThread is not from the set process.
+ SBError AddThread(lldb::SBThread thread);
+
+ /// Remove a thread from the list of threads to save.
+ ///
+ /// \param thread The thread to remove.
+ /// \return True if the thread was removed, false if it was not in the list.
+ bool RemoveThread(lldb::SBThread thread);
+
/// Reset all options.
void Clear();
diff --git a/lldb/include/lldb/API/SBThread.h b/lldb/include/lldb/API/SBThread.h
index dcf6aa9d5424e8..f8ae627da5acee 100644
--- a/lldb/include/lldb/API/SBThread.h
+++ b/lldb/include/lldb/API/SBThread.h
@@ -233,6 +233,7 @@ class LLDB_API SBThread {
friend class SBBreakpoint;
friend class SBBreakpointLocation;
friend class SBBreakpointCallbackBaton;
+ friend class SBSaveCoreOptions;
friend class SBExecutionContext;
friend class SBFrame;
friend class SBProcess;
@@ -253,6 +254,8 @@ class LLDB_API SBThread {
SBError ResumeNewPlan(lldb_private::ExecutionContext &exe_ctx,
lldb_private::ThreadPlan *new_plan);
+ lldb::ThreadSP GetSP() const;
+
lldb::ExecutionContextRefSP m_opaque_sp;
lldb_private::Thread *operator->();
diff --git a/lldb/include/lldb/Symbol/SaveCoreOptions.h
b/lldb/include/lldb/Symbol/SaveCoreOptions.h
index 583bc1f483d043..f4fed4676fa4ae 100644
--- a/lldb/include/lldb/Symbol/SaveCoreOptions.h
+++ b/lldb/include/lldb/Symbol/SaveCoreOptions.h
@@ -15,6 +15,7 @@
#include <optional>
#include <string>
+#include <unordered_set>
namespace lldb_private {
@@ -32,13 +33,25 @@ class SaveCoreOptions {
void SetOutputFile(lldb_private::FileSpec file);
const std::optional<lldb_private::FileSpec> GetOutputFile() const;
+ Status SetProcess(lldb::ProcessSP process_sp);
+
+ Status AddThread(lldb::ThreadSP thread_sp);
+ bool RemoveThread(lldb::ThreadSP thread_sp);
+ bool ShouldThreadBeSaved(lldb::tid_t tid) const;
+
+ Status EnsureValidConfiguration(lldb::ProcessSP process_sp) const;
+
void Clear();
private:
+ void ClearProcessSpecificData();
+
std::optional<std::string> m_plugin_name;
std::optional<lldb_private::FileSpec> m_file;
std::optional<lldb::SaveCoreStyle> m_style;
+ lldb::ProcessSP m_process_sp;
+ std::unordered_set<lldb::tid_t> m_threads_to_save;
};
} // namespace lldb_private
-#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_SaveCoreOPTIONS_H
+#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_SAVECOREOPTIONS_H
diff --git a/lldb/include/lldb/Target/Process.h
b/lldb/include/lldb/Target/Process.h
index a63d6622949dfe..7d2e3bddcd4e62 100644
--- a/lldb/include/lldb/Target/Process.h
+++ b/lldb/include/lldb/Target/Process.h
@@ -738,9 +738,15 @@ class Process : public
std::enable_shared_from_this<Process>,
/// Helper function for Process::SaveCore(...) that calculates the address
/// ranges that should be saved. This allows all core file plug-ins to save
/// consistent memory ranges given a \a core_style.
- Status CalculateCoreFileSaveRanges(lldb::SaveCoreStyle core_style,
+ Status CalculateCoreFileSaveRanges(const SaveCoreOptions &core_options,
CoreFileMemoryRanges &ranges);
+ /// Helper function for Process::SaveCore(...) that calculates the thread
list
+ /// based upon options set within a given \a core_options object.
+ /// \note If there is no thread list defined, all threads will be saved.
+ std::vector<lldb::ThreadSP>
+ CalculateCoreFileThreadList(const SaveCoreOptions &core_options);
+
protected:
virtual JITLoaderList &GetJITLoaders();
diff --git a/lldb/source/API/SBSaveCoreOptions.cpp
b/lldb/source/API/SBSaveCoreOptions.cpp
index 6c3f74596203d6..6d7aabb1fefa3d 100644
--- a/lldb/source/API/SBSaveCoreOptions.cpp
+++ b/lldb/source/API/SBSaveCoreOptions.cpp
@@ -7,8 +7,6 @@
//===----------------------------------------------------------------------===//
#include "lldb/API/SBSaveCoreOptions.h"
-#include "lldb/API/SBError.h"
-#include "lldb/API/SBFileSpec.h"
#include "lldb/Host/FileSystem.h"
#include "lldb/Symbol/SaveCoreOptions.h"
#include "lldb/Utility/Instrumentation.h"
@@ -75,6 +73,21 @@ lldb::SaveCoreStyle SBSaveCoreOptions::GetStyle() const {
return m_opaque_up->GetStyle();
}
+SBError SBSaveCoreOptions::SetProcess(lldb::SBProcess process) {
+ LLDB_INSTRUMENT_VA(this, process);
+ return m_opaque_up->SetProcess(process.GetSP());
+}
+
+SBError SBSaveCoreOptions::AddThread(lldb::SBThread thread) {
+ LLDB_INSTRUMENT_VA(this, thread);
+ return m_opaque_up->AddThread(thread.GetSP());
+}
+
+bool SBSaveCoreOptions::RemoveThread(lldb::SBThread thread) {
+ LLDB_INSTRUMENT_VA(this, thread);
+ return m_opaque_up->RemoveThread(thread.GetSP());
+}
+
void SBSaveCoreOptions::Clear() {
LLDB_INSTRUMENT_VA(this);
m_opaque_up->Clear();
diff --git a/lldb/source/API/SBThread.cpp b/lldb/source/API/SBThread.cpp
index 53643362421d4f..55688c9cfa4f1a 100644
--- a/lldb/source/API/SBThread.cpp
+++ b/lldb/source/API/SBThread.cpp
@@ -1331,6 +1331,8 @@ bool SBThread::SafeToCallFunctions() {
return true;
}
+lldb::ThreadSP SBThread::GetSP() const { return m_opaque_sp->GetThreadSP(); }
+
lldb_private::Thread *SBThread::operator->() {
return get();
}
diff --git a/lldb/source/Core/PluginManager.cpp
b/lldb/source/Core/PluginManager.cpp
index 01bee8680b7ba5..fbd78a77805784 100644
--- a/lldb/source/Core/PluginManager.cpp
+++ b/lldb/source/Core/PluginManager.cpp
@@ -714,6 +714,10 @@ Status PluginManager::SaveCore(const lldb::ProcessSP
&process_sp,
return error;
}
+ error = options.EnsureValidConfiguration(process_sp);
+ if (error.Fail())
+ return error;
+
if (!options.GetPluginName().has_value()) {
// Try saving core directly from the process plugin first.
llvm::Expected<bool> ret =
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index ce095bcc48374b..4322bd7e2674f0 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6347,22 +6347,24 @@ struct segment_vmaddr {
// are some multiple passes over the image list while calculating
// everything.
-static offset_t CreateAllImageInfosPayload(
- const lldb::ProcessSP &process_sp, offset_t initial_file_offset,
- StreamString &all_image_infos_payload, SaveCoreStyle core_style) {
+static offset_t
+CreateAllImageInfosPayload(const lldb::ProcessSP &process_sp,
+ offset_t initial_file_offset,
+ StreamString &all_image_infos_payload,
+ const lldb_private::SaveCoreOptions &options) {
Target &target = process_sp->GetTarget();
ModuleList modules = target.GetImages();
// stack-only corefiles have no reason to include binaries that
// are not executing; we're trying to make the smallest corefile
// we can, so leave the rest out.
- if (core_style == SaveCoreStyle::eSaveCoreStackOnly)
+ if (options.GetStyle() == SaveCoreStyle::eSaveCoreStackOnly)
modules.Clear();
std::set<std::string> executing_uuids;
- ThreadList &thread_list(process_sp->GetThreadList());
- for (uint32_t i = 0; i < thread_list.GetSize(); i++) {
- ThreadSP thread_sp = thread_list.GetThreadAtIndex(i);
+ std::vector<ThreadSP> thread_list =
+ process_sp->CalculateCoreFileThreadList(options);
+ for (const ThreadSP &thread_sp : thread_list) {
uint32_t stack_frame_count = thread_sp->GetStackFrameCount();
for (uint32_t j = 0; j < stack_frame_count; j++) {
StackFrameSP stack_frame_sp = thread_sp->GetStackFrameAtIndex(j);
@@ -6559,7 +6561,7 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP
&process_sp,
if (make_core) {
Process::CoreFileMemoryRanges core_ranges;
- error = process_sp->CalculateCoreFileSaveRanges(core_style, core_ranges);
+ error = process_sp->CalculateCoreFileSaveRanges(options, core_ranges);
if (error.Success()) {
const uint32_t addr_byte_size = target_arch.GetAddressByteSize();
const ByteOrder byte_order = target_arch.GetByteOrder();
@@ -6730,8 +6732,8 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP
&process_sp,
std::make_shared<StructuredData::Dictionary>());
StructuredData::ArraySP threads(
std::make_shared<StructuredData::Array>());
- for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
- ThreadSP thread_sp(thread_list.GetThreadAtIndex(thread_idx));
+ for (const ThreadSP &thread_sp :
+ process_sp->CalculateCoreFileThreadList(options)) {
StructuredData::DictionarySP thread(
std::make_shared<StructuredData::Dictionary>());
thread->AddIntegerItem("thread_id", thread_sp->GetID());
@@ -6754,7 +6756,7 @@ bool ObjectFileMachO::SaveCore(const lldb::ProcessSP
&process_sp,
all_image_infos_lcnote_up->payload_file_offset = file_offset;
file_offset = CreateAllImageInfosPayload(
process_sp, file_offset, all_image_infos_lcnote_up->payload,
- core_style);
+ options);
lc_notes.push_back(std::move(all_image_infos_lcnote_up));
// Add LC_NOTE load commands
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.cpp
b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.cpp
index de212c6b20da7e..c0cc3af638a777 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.cpp
+++ b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.cpp
@@ -69,10 +69,9 @@ Status
MinidumpFileBuilder::AddHeaderAndCalculateDirectories() {
m_expected_directories += 9;
// Go through all of the threads and check for exceptions.
- lldb_private::ThreadList thread_list = m_process_sp->GetThreadList();
- const uint32_t num_threads = thread_list.GetSize();
- for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
- ThreadSP thread_sp(thread_list.GetThreadAtIndex(thread_idx));
+ std::vector<lldb::ThreadSP> threads =
+ m_process_sp->CalculateCoreFileThreadList(m_save_core_options);
+ for (const ThreadSP &thread_sp : threads) {
StopInfoSP stop_info_sp = thread_sp->GetStopInfo();
if (stop_info_sp) {
const StopReason &stop_reason = stop_info_sp->GetStopReason();
@@ -588,12 +587,13 @@ Status MinidumpFileBuilder::FixThreadStacks() {
Status MinidumpFileBuilder::AddThreadList() {
constexpr size_t minidump_thread_size = sizeof(llvm::minidump::Thread);
- lldb_private::ThreadList thread_list = m_process_sp->GetThreadList();
+ std::vector<ThreadSP> thread_list =
+ m_process_sp->CalculateCoreFileThreadList(m_save_core_options);
// size of the entire thread stream consists of:
// number of threads and threads array
size_t thread_stream_size = sizeof(llvm::support::ulittle32_t) +
- thread_list.GetSize() * minidump_thread_size;
+ thread_list.size() * minidump_thread_size;
// save for the ability to set up RVA
size_t size_before = GetCurrentDataEndOffset();
Status error;
@@ -602,17 +602,15 @@ Status MinidumpFileBuilder::AddThreadList() {
return error;
llvm::support::ulittle32_t thread_count =
- static_cast<llvm::support::ulittle32_t>(thread_list.GetSize());
+ static_cast<llvm::support::ulittle32_t>(thread_list.size());
m_data.AppendData(&thread_count, sizeof(llvm::support::ulittle32_t));
// Take the offset after the thread count.
m_thread_list_start = GetCurrentDataEndOffset();
DataBufferHeap helper_data;
- const uint32_t num_threads = thread_list.GetSize();
Log *log = GetLog(LLDBLog::Object);
- for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
- ThreadSP thread_sp(thread_list.GetThreadAtIndex(thread_idx));
+ for (const ThreadSP &thread_sp : thread_list) {
RegisterContextSP reg_ctx_sp(thread_sp->GetRegisterContext());
if (!reg_ctx_sp) {
@@ -650,7 +648,7 @@ Status MinidumpFileBuilder::AddThreadList() {
m_tid_to_reg_ctx[thread_sp->GetID()] = thread_context_memory_locator;
LLDB_LOGF(log, "AddThreadList for thread %d: thread_context %zu bytes",
- thread_idx, thread_context.size());
+ thread_sp->GetIndexID(), thread_context.size());
helper_data.AppendData(thread_context.data(), thread_context.size());
llvm::minidump::Thread t;
@@ -674,11 +672,10 @@ Status MinidumpFileBuilder::AddThreadList() {
}
Status MinidumpFileBuilder::AddExceptions() {
- lldb_private::ThreadList thread_list = m_process_sp->GetThreadList();
+ std::vector<ThreadSP> thread_list =
+ m_process_sp->CalculateCoreFileThreadList(m_save_core_options);
Status error;
- const uint32_t num_threads = thread_list.GetSize();
- for (uint32_t thread_idx = 0; thread_idx < num_threads; ++thread_idx) {
- ThreadSP thread_sp(thread_list.GetThreadAtIndex(thread_idx));
+ for (const ThreadSP &thread_sp : thread_list) {
StopInfoSP stop_info_sp = thread_sp->GetStopInfo();
bool add_exception = false;
if (stop_info_sp) {
@@ -819,7 +816,7 @@ Status MinidumpFileBuilder::AddLinuxFileStreams() {
return error;
}
-Status MinidumpFileBuilder::AddMemoryList(SaveCoreStyle core_style) {
+Status MinidumpFileBuilder::AddMemoryList() {
Status error;
// We first save the thread stacks to ensure they fit in the first UINT32_MAX
@@ -828,18 +825,26 @@ Status MinidumpFileBuilder::AddMemoryList(SaveCoreStyle
core_style) {
// in accessible with a 32 bit offset.
Process::CoreFileMemoryRanges ranges_32;
Process::CoreFileMemoryRanges ranges_64;
- error = m_process_sp->CalculateCoreFileSaveRanges(
- SaveCoreStyle::eSaveCoreStackOnly, ranges_32);
+ Process::CoreFileMemoryRanges all_core_memory_ranges;
+ error = m_process_sp->CalculateCoreFileSaveRanges(m_save_core_options,
+ all_core_memory_ranges);
if (error.Fail())
return error;
- // Calculate totalsize including the current offset.
+ // Start by saving all of the stacks and ensuring they fit under the 32b
+ // limit.
uint64_t total_size = GetCurrentDataEndOffset();
- total_size += ranges_32.size() * sizeof(llvm::minidump::MemoryDescriptor);
- std::unordered_set<addr_t> stack_start_addresses;
- for (const auto &core_range : ranges_32) {
- stack_start_addresses.insert(core_range.range.start());
- total_size += core_range.range.size();
+ auto iterator = all_core_memory_ranges.begin();
+ while (iterator != all_core_memory_ranges.end()) {
+ if (m_saved_stack_ranges.count(iterator->range.start()) > 0) {
+ // We don't save stacks twice.
+ ranges_32.push_back(*iterator);
+ total_size +=
+ iterator->range.size() + sizeof(llvm::minidump::MemoryDescriptor);
+ iterator = all_core_memory_ranges.erase(iterator);
+ } else {
+ iterator++;
+ }
}
if (total_size >= UINT32_MAX) {
@@ -849,14 +854,6 @@ Status MinidumpFileBuilder::AddMemoryList(SaveCoreStyle
core_style) {
return error;
}
- Process::CoreFileMemoryRanges all_core_memory_ranges;
- if (core_style != SaveCoreStyle::eSaveCoreStackOnly) {
- error = m_process_sp->CalculateCoreFileSaveRanges(core_style,
- all_core_memory_ranges);
- if (error.Fail())
- return error;
- }
-
// After saving the stacks, we start packing as much as we can into 32b.
// We apply a generous padding here so that the Directory, MemoryList and
// Memory64List sections all begin in 32b addressable space.
@@ -864,16 +861,13 @@ Status MinidumpFileBuilder::AddMemoryList(SaveCoreStyle
core_style) {
// All core memeroy ranges will either container nothing on stacks only
// or all the memory ranges including stacks
if (!all_core_memory_ranges.empty())
- total_size +=
- 256 + (all_core_memory_ranges.size() - stack_start_addresses.size()) *
- sizeof(llvm::minidump::MemoryDescriptor_64);
+ total_size += 256 + (all_core_memory_ranges.size() *
+ sizeof(llvm::minidump::MemoryDescriptor_64));
for (const auto &core_range : all_core_memory_ranges) {
const addr_t range_size = core_range.range.size();
- if (stack_start_addresses.count(core_range.range.start()) > 0)
- // Don't double save stacks.
- continue;
-
+ // We don't need to check for stacks here because we already removed them
+ // from all_core_memory_ranges.
if (total_size + range_size < UINT32_MAX) {
ranges_32.push_back(core_range);
total_size += range_size;
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
index 20564e0661f2a2..c039492aa5c5a6 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
@@ -75,8 +75,10 @@ lldb_private::Status WriteString(const std::string &to_write,
class MinidumpFileBuilder {
public:
MinidumpFileBuilder(lldb::FileUP &&core_file,
- const lldb::ProcessSP &process_sp)
- : m_process_sp(process_sp), m_core_file(std::move(core_file)){};
+ const lldb::ProcessSP &process_sp,
+ const lldb_private::SaveCoreOptions &save_core_options)
+ : m_process_sp(process_sp), m_core_file(std::move(core_file)),
+ m_save_core_options(save_core_options){};
MinidumpFileBuilder(const MinidumpFileBuilder &) = delete;
MinidumpFileBuilder &operator=(const MinidumpFileBuilder &) = delete;
@@ -103,7 +105,7 @@ class MinidumpFileBuilder {
// Add Exception streams for any threads that stopped with exceptions.
lldb_private::Status AddExceptions();
// Add MemoryList stream, containing dumps of important memory segments
- lldb_private::Status AddMemoryList(lldb::SaveCoreStyle core_style);
+ lldb_private::Status AddMemoryList();
// Add MiscInfo stream, mainly providing ProcessId
lldb_private::Status AddMiscInfo();
// Add informative files about a Linux process
@@ -163,7 +165,9 @@ class MinidumpFileBuilder {
// to duplicate it in the exception data.
std::unordered_map<lldb::tid_t, llvm::minidump::LocationDescriptor>
m_tid_to_reg_ctx;
+ std::unordered_set<lldb::addr_t> m_saved_stack_ranges;
lldb::FileUP m_core_file;
+ lldb_private::SaveCoreOptions m_save_core_options;
};
#endif // LLDB_SOURCE_PLUGINS_OBJECTFILE_MINIDUMP_MINIDUMPFILEBUILDER_H
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
index faa144bfb5f6a5..2380ff4c00ca9f 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
@@ -74,7 +74,8 @@ bool ObjectFileMinidump::SaveCore(const lldb::ProcessSP
&process_sp,
error = maybe_core_file.takeError();
return false;
}
- MinidumpFileBuilder builder(std::move(maybe_core_file.get()), process_sp);
+ MinidumpFileBuilder builder(std::move(maybe_core_file.get()), process_sp,
+ options);
Log *log = GetLog(LLDBLog::Object);
error = builder.AddHeaderAndCalculateDirectories();
@@ -121,7 +122,7 @@ bool ObjectFileMinidump::SaveCore(const lldb::ProcessSP
&process_sp,
// Note: add memory HAS to be the last thing we do. It can overflow into 64b
// land and many RVA's only support 32b
- error = builder.AddMemoryList(core_style);
+ error = builder.AddMemoryList();
if (error.Fail()) {
LLDB_LOGF(log, "AddMemoryList failed: %s", error.AsCString());
return false;
diff --git a/lldb/source/Symbol/SaveCoreOptions.cpp
b/lldb/source/Symbol/SaveCoreOptions.cpp
index 0f6fdac1ce22e6..3c4ca2d852b76a 100644
--- a/lldb/source/Symbol/SaveCoreOptions.cpp
+++ b/lldb/source/Symbol/SaveCoreOptions.cpp
@@ -8,6 +8,8 @@
#include "lldb/Symbol/SaveCoreOptions.h"
#include "lldb/Core/PluginManager.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Target/Thread.h"
using namespace lldb;
using namespace lldb_private;
@@ -46,8 +48,86 @@ SaveCoreOptions::GetOutputFile() const {
return m_file;
}
+Status SaveCoreOptions::SetProcess(lldb::ProcessSP process_sp) {
+ Status error;
+ if (!process_sp) {
+ ClearProcessSpecificData();
+ m_process_sp.reset();
+ return error;
+ }
+
+ if (!process_sp->IsValid()) {
+ error.SetErrorString("Cannot assign an invalid process.");
+ return error;
+ }
+
+ // Don't clear any process specific data if the process is the same.
+ if (m_process_sp == process_sp)
+ return error;
+
+ ClearProcessSpecificData();
+ m_process_sp = process_sp;
+ return error;
+}
+
+Status SaveCoreOptions::AddThread(lldb::ThreadSP thread_sp) {
+ Status error;
+ if (!thread_sp) {
+ error.SetErrorString("invalid thread");
+ return error;
+ }
+
+ if (m_process_sp) {
+ if (m_process_sp != thread_sp->GetProcess()) {
+ error.SetErrorString("Cannot add a thread from a different process.");
+ return error;
+ }
+ } else {
+ m_process_sp = thread_sp->GetProcess();
+ }
+
+ m_threads_to_save.insert(thread_sp->GetID());
+ return error;
+}
+
+bool SaveCoreOptions::RemoveThread(lldb::ThreadSP thread_sp) {
+ return thread_sp && m_threads_to_save.erase(thread_sp->GetID()) > 0;
+}
+
+bool SaveCoreOptions::ShouldThreadBeSaved(lldb::tid_t tid) const {
+ // If the user specified no threads to save, then we save all threads.
+ if (m_threads_to_save.empty())
+ return true;
+ return m_threads_to_save.count(tid) > 0;
+}
+
+Status SaveCoreOptions::EnsureValidConfiguration(
+ lldb::ProcessSP process_sp) const {
+ Status error;
+ std::string error_str;
+ if (!m_threads_to_save.empty() && GetStyle() == lldb::eSaveCoreFull)
+ error_str += "Cannot save a full core with a subset of threads\n";
+
+ if (m_process_sp && m_process_sp != process_sp)
+ error_str += "Cannot save core for process using supplied core options. "
+ "Options were constructed targeting a different process. \n";
+
+ if (!error_str.empty())
+ error.SetErrorString(error_str);
+
+ return error;
+}
+
+void SaveCoreOptions::ClearProcessSpecificData() {
+ // Deliberately not following the formatter style here to indicate that
+ // this method will be expanded in the future.
+ m_threads_to_save.clear();
+}
+
void SaveCoreOptions::Clear() {
m_file = std::nullopt;
m_plugin_name = std::nullopt;
m_style = std::nullopt;
+ m_threads_to_save.clear();
+ m_process_sp.reset();
}
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 728f9aadef779a..f841c0cfcf8fc8 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -6537,8 +6537,9 @@ static void AddRegion(const MemoryRegionInfo ®ion,
bool try_dirty_pages,
}
static void SaveOffRegionsWithStackPointers(
- Process &process, const MemoryRegionInfos ®ions,
- Process::CoreFileMemoryRanges &ranges, std::set<addr_t> &stack_ends) {
+ Process &process, const SaveCoreOptions &core_options,
+ const MemoryRegionInfos ®ions, Process::CoreFileMemoryRanges &ranges,
+ std::set<addr_t> &stack_ends) {
const bool try_dirty_pages = true;
// Before we take any dump, we want to save off the used portions of the
@@ -6560,10 +6561,16 @@ static void SaveOffRegionsWithStackPointers(
if (process.GetMemoryRegionInfo(sp, sp_region).Success()) {
const size_t stack_head = (sp - red_zone);
const size_t stack_size = sp_region.GetRange().GetRangeEnd() -
stack_head;
+ // Even if the SaveCoreOption doesn't want us to save the stack
+ // we still need to populate the stack_ends set so it doesn't get saved
+ // off in other calls
sp_region.GetRange().SetRangeBase(stack_head);
sp_region.GetRange().SetByteSize(stack_size);
stack_ends.insert(sp_region.GetRange().GetRangeEnd());
- AddRegion(sp_region, try_dirty_pages, ranges);
+ // This will return true if the threadlist the user specified is empty,
+ // or contains the thread id from thread_sp.
+ if (core_options.ShouldThreadBeSaved(thread_sp->GetID()))
+ AddRegion(sp_region, try_dirty_pages, ranges);
}
}
}
@@ -6632,10 +6639,11 @@ static void GetCoreFileSaveRangesStackOnly(
}
}
-Status Process::CalculateCoreFileSaveRanges(lldb::SaveCoreStyle core_style,
+Status Process::CalculateCoreFileSaveRanges(const SaveCoreOptions &options,
CoreFileMemoryRanges &ranges) {
lldb_private::MemoryRegionInfos regions;
Status err = GetMemoryRegions(regions);
+ SaveCoreStyle core_style = options.GetStyle();
if (err.Fail())
return err;
if (regions.empty())
@@ -6645,7 +6653,7 @@ Status
Process::CalculateCoreFileSaveRanges(lldb::SaveCoreStyle core_style,
"eSaveCoreUnspecified");
std::set<addr_t> stack_ends;
- SaveOffRegionsWithStackPointers(*this, regions, ranges, stack_ends);
+ SaveOffRegionsWithStackPointers(*this, options, regions, ranges, stack_ends);
switch (core_style) {
case eSaveCoreUnspecified:
@@ -6673,6 +6681,18 @@ Status
Process::CalculateCoreFileSaveRanges(lldb::SaveCoreStyle core_style,
return Status(); // Success!
}
+std::vector<ThreadSP>
+Process::CalculateCoreFileThreadList(const SaveCoreOptions &core_options) {
+ std::vector<ThreadSP> thread_list;
+ for (const lldb::ThreadSP &thread_sp : m_thread_list.Threads()) {
+ if (core_options.ShouldThreadBeSaved(thread_sp->GetID())) {
+ thread_list.push_back(thread_sp);
+ }
+ }
+
+ return thread_list;
+}
+
void Process::SetAddressableBitMasks(AddressableBits bit_masks) {
uint32_t low_memory_addr_bits = bit_masks.GetLowmemAddressableBits();
uint32_t high_memory_addr_bits = bit_masks.GetHighmemAddressableBits();
diff --git
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
index 96511d790271fe..2e1521cd79fb98 100644
---
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
+++
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
@@ -199,3 +199,58 @@ def test_save_linux_mini_dump(self):
os.unlink(core_sb_dirty)
if os.path.isfile(core_sb_full):
os.unlink(core_sb_full)
+
+ @skipUnlessArch("x86_64")
+ @skipUnlessPlatform(["linux"])
+ def test_save_linux_mini_dump_thread_options(self):
+ """Test that we can save a Linux mini dump
+ with a subset of threads"""
+
+ self.build()
+ exe = self.getBuildArtifact("a.out")
+ thread_subset_dmp = self.getBuildArtifact("core.thread.subset.dmp")
+ try:
+ target = self.dbg.CreateTarget(exe)
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory()
+ )
+ self.assertState(process.GetState(), lldb.eStateStopped)
+
+ thread_to_include = process.GetThreadAtIndex(0)
+ options = lldb.SBSaveCoreOptions()
+ thread_subset_spec = lldb.SBFileSpec(thread_subset_dmp)
+ options.AddThread(thread_to_include)
+ options.SetOutputFile(thread_subset_spec)
+ options.SetPluginName("minidump")
+ options.SetStyle(lldb.eSaveCoreStackOnly)
+ error = process.SaveCore(options)
+ self.assertTrue(error.Success())
+
+ core_target = self.dbg.CreateTarget(None)
+ core_process = core_target.LoadCore(thread_subset_dmp)
+
+ self.assertTrue(core_process, PROCESS_IS_VALID)
+ self.assertEqual(core_process.GetNumThreads(), 1)
+ saved_thread = core_process.GetThreadAtIndex(0)
+ expected_thread = process.GetThreadAtIndex(0)
+ self.assertEqual(expected_thread.GetThreadID(),
saved_thread.GetThreadID())
+ expected_sp = expected_thread.GetFrameAtIndex(0).GetSP()
+ saved_sp = saved_thread.GetFrameAtIndex(0).GetSP()
+ self.assertEqual(expected_sp, saved_sp)
+ expected_region = lldb.SBMemoryRegionInfo()
+ saved_region = lldb.SBMemoryRegionInfo()
+ error = core_process.GetMemoryRegionInfo(saved_sp, saved_region)
+ self.assertTrue(error.Success(), error.GetCString())
+ error = process.GetMemoryRegionInfo(expected_sp, expected_region)
+ self.assertTrue(error.Success(), error.GetCString())
+ self.assertEqual(
+ expected_region.GetRegionBase(), saved_region.GetRegionBase()
+ )
+ self.assertEqual(
+ expected_region.GetRegionEnd(), saved_region.GetRegionEnd()
+ )
+
+ finally:
+ self.assertTrue(self.dbg.DeleteTarget(target))
+ if os.path.isfile(thread_subset_dmp):
+ os.unlink(thread_subset_dmp)
diff --git
a/lldb/test/API/python_api/sbsavecoreoptions/TestSBSaveCoreOptions.py
b/lldb/test/API/python_api/sbsavecoreoptions/TestSBSaveCoreOptions.py
index c509e81d8951a8..40d0cc7e96ff48 100644
--- a/lldb/test/API/python_api/sbsavecoreoptions/TestSBSaveCoreOptions.py
+++ b/lldb/test/API/python_api/sbsavecoreoptions/TestSBSaveCoreOptions.py
@@ -4,8 +4,26 @@
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
-
class SBSaveCoreOptionsAPICase(TestBase):
+ basic_minidump = "basic_minidump.yaml"
+ basic_minidump_different_pid = "basic_minidump_different_pid.yaml"
+
+ def get_process_from_yaml(self, yaml_file):
+ minidump_path = self.getBuildArtifact(os.path.basename(yaml_file) +
".dmp")
+ print ("minidump_path: " + minidump_path)
+ self.yaml2obj(yaml_file, minidump_path)
+ self.assertTrue(os.path.exists(minidump_path), "yaml2obj did not emit
a minidump file")
+ target = self.dbg.CreateTarget(None)
+ process = target.LoadCore(minidump_path)
+ self.assertTrue(process.IsValid(), "Process is not valid")
+ return process
+
+ def get_basic_process(self):
+ return self.get_process_from_yaml(self.basic_minidump)
+
+ def get_basic_process_different_pid(self):
+ return self.get_process_from_yaml(self.basic_minidump_different_pid)
+
def test_plugin_name_assignment(self):
"""Test assignment ensuring valid plugin names only."""
options = lldb.SBSaveCoreOptions()
@@ -26,3 +44,38 @@ def test_default_corestyle_behavior(self):
"""Test that the default core style is unspecified."""
options = lldb.SBSaveCoreOptions()
self.assertEqual(options.GetStyle(), lldb.eSaveCoreUnspecified)
+
+ def test_adding_and_removing_thread(self):
+ """Test adding and removing a thread from save core options."""
+ self.assertTrue(self.dbg)
+ options = lldb.SBSaveCoreOptions()
+ process = self.get_basic_process()
+ self.assertTrue(process.IsValid(), "Process is not valid")
+ thread = process.GetThreadAtIndex(0)
+ error = options.AddThread(thread)
+ self.assertTrue(error.Success(), error.GetCString())
+ removed_success = options.RemoveThread(thread)
+ self.assertTrue(removed_success)
+ removed_success = options.RemoveThread(thread)
+ self.assertFalse(removed_success)
+
+
+ def test_adding_thread_different_process(self):
+ """Test adding and removing a thread from save core options."""
+ options = lldb.SBSaveCoreOptions()
+ process = self.get_basic_process()
+ process_2 = self.get_basic_process_different_pid()
+ thread = process.GetThreadAtIndex(0)
+ error = options.AddThread(thread)
+ self.assertTrue(error.Success())
+ thread_2 = process_2.GetThreadAtIndex(0)
+ error = options.AddThread(thread_2)
+ self.assertTrue(error.Fail())
+ options.Clear()
+ error = options.AddThread(thread_2)
+ self.assertTrue(error.Success())
+ options.SetProcess(process)
+ error = options.AddThread(thread_2)
+ self.assertTrue(error.Fail())
+ error = options.AddThread(thread)
+ self.assertTrue(error.Success())
diff --git a/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump.yaml
b/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump.yaml
new file mode 100644
index 00000000000000..993c7da21225a9
--- /dev/null
+++ b/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump.yaml
@@ -0,0 +1,26 @@
+--- !minidump
+Streams:
+ - Type: SystemInfo
+ Processor Arch: AMD64
+ Processor Level: 6
+ Processor Revision: 15876
+ Number of Processors: 40
+ Platform ID: Linux
+ CSD Version: 'Linux 3.13.0-91-generic #138-Ubuntu SMP Fri Jun 24
17:00:34 UTC 2016 x86_64'
+ CPU:
+ Vendor ID: GenuineIntel
+ Version Info: 0x00000000
+ Feature Info: 0x00000000
+ - Type: LinuxProcStatus
+ Text: |
+ Name: test-yaml
+ Umask: 0002
+ State: t (tracing stop)
+ Pid: 8567
+ - Type: ThreadList
+ Threads:
+ - Thread Id: 0x000074DD
+ Context:
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B0010000000000033000000000000000000000002020100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040109600000000000100000000000000000000000000000068E7D0C8FF7F000068E7D0C8FF7F000097E6D0C8FF7F000010109600000000000000000000000000020000000000000088E4D0C8FF7F0000603FFF85C77F0000F00340000000000080E7D0C8FF7F000000000000000000000000000000000000E0034000000000007F0300000000000000000000000000000000000000000000801F0000FFFF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF252525252525252525252525252525250000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ Stack:
+ Start of Memory Range: 0x00007FFFC8D0E000
+ Content: 'DEADBEEF'
diff --git
a/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump_different_pid.yaml
b/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump_different_pid.yaml
new file mode 100644
index 00000000000000..7393f1fe62af3d
--- /dev/null
+++
b/lldb/test/API/python_api/sbsavecoreoptions/basic_minidump_different_pid.yaml
@@ -0,0 +1,26 @@
+--- !minidump
+Streams:
+ - Type: SystemInfo
+ Processor Arch: AMD64
+ Processor Level: 6
+ Processor Revision: 15876
+ Number of Processors: 40
+ Platform ID: Linux
+ CSD Version: 'Linux 3.13.0-91-generic #138-Ubuntu SMP Fri Jun 24
17:00:34 UTC 2016 x86_64'
+ CPU:
+ Vendor ID: GenuineIntel
+ Version Info: 0x00000000
+ Feature Info: 0x00000000
+ - Type: LinuxProcStatus
+ Text: |
+ Name: test-yaml
+ Umask: 0002
+ State: t (tracing stop)
+ Pid: 1967
+ - Type: ThreadList
+ Threads:
+ - Thread Id: 0x000074DD
+ Context:
0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000B0010000000000033000000000000000000000002020100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040109600000000000100000000000000000000000000000068E7D0C8FF7F000068E7D0C8FF7F000097E6D0C8FF7F000010109600000000000000000000000000020000000000000088E4D0C8FF7F0000603FFF85C77F0000F00340000000000080E7D0C8FF7F000000000000000000000000000000000000E0034000000000007F0300000000000000000000000000000000000000000000801F0000FFFF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF252525252525252525252525252525250000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FF00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
+ Stack:
+ Start of Memory Range: 0x00007FFFC8D0E000
+ Content: 'DEADBEEF'
>From 29cb63f98492e1cd638d221708a25c5a2e3571fb Mon Sep 17 00:00:00 2001
From: Jacob Lalonde <jalalo...@fb.com>
Date: Mon, 5 Aug 2024 09:31:29 -0700
Subject: [PATCH 2/4] Reapply "[LLDB][SBSaveCore] Fix bug where default values
are not propagated. (#101770)"
This reverts commit 86f7374078288e2b3d3d0fd66428f7752e2319e6.
---
lldb/include/lldb/Core/PluginManager.h | 2 +-
lldb/include/lldb/lldb-private-interfaces.h | 2 +-
lldb/source/Core/PluginManager.cpp | 2 +-
.../ObjectFile/Mach-O/ObjectFileMachO.cpp | 11 ++++----
.../ObjectFile/Mach-O/ObjectFileMachO.h | 2 +-
.../ObjectFile/Minidump/MinidumpFileBuilder.h | 2 +-
.../Minidump/ObjectFileMinidump.cpp | 7 +++--
.../ObjectFile/Minidump/ObjectFileMinidump.h | 2 +-
.../ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 2 +-
.../ObjectFile/PECOFF/ObjectFilePECOFF.h | 2 +-
.../ObjectFile/PECOFF/WindowsMiniDump.cpp | 3 +--
.../ObjectFile/PECOFF/WindowsMiniDump.h | 3 +--
.../process_save_core/TestProcessSaveCore.py | 26 +++++++++++++++++++
13 files changed, 45 insertions(+), 21 deletions(-)
diff --git a/lldb/include/lldb/Core/PluginManager.h
b/lldb/include/lldb/Core/PluginManager.h
index a23f834f471fb3..e4e0c3eea67f8c 100644
--- a/lldb/include/lldb/Core/PluginManager.h
+++ b/lldb/include/lldb/Core/PluginManager.h
@@ -194,7 +194,7 @@ class PluginManager {
GetObjectFileCreateMemoryCallbackForPluginName(llvm::StringRef name);
static Status SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &core_options);
+ lldb_private::SaveCoreOptions &core_options);
// ObjectContainer
static bool RegisterPlugin(
diff --git a/lldb/include/lldb/lldb-private-interfaces.h
b/lldb/include/lldb/lldb-private-interfaces.h
index 87c5ff8d22fb68..b3c8cda899b95e 100644
--- a/lldb/include/lldb/lldb-private-interfaces.h
+++ b/lldb/include/lldb/lldb-private-interfaces.h
@@ -57,7 +57,7 @@ typedef ObjectFile *(*ObjectFileCreateMemoryInstance)(
const lldb::ModuleSP &module_sp, lldb::WritableDataBufferSP data_sp,
const lldb::ProcessSP &process_sp, lldb::addr_t offset);
typedef bool (*ObjectFileSaveCore)(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions
&options,
+ lldb_private::SaveCoreOptions &options,
Status &error);
typedef EmulateInstruction *(*EmulateInstructionCreateInstance)(
const ArchSpec &arch, InstructionType inst_type);
diff --git a/lldb/source/Core/PluginManager.cpp
b/lldb/source/Core/PluginManager.cpp
index fbd78a77805784..f243807df509ef 100644
--- a/lldb/source/Core/PluginManager.cpp
+++ b/lldb/source/Core/PluginManager.cpp
@@ -702,7 +702,7 @@
PluginManager::GetObjectFileCreateMemoryCallbackForPluginName(
}
Status PluginManager::SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options) {
+ lldb_private::SaveCoreOptions &options) {
Status error;
if (!options.GetOutputFile()) {
error.SetErrorString("No output file specified");
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
index 4322bd7e2674f0..22ece4f4dacf79 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -6351,7 +6351,7 @@ static offset_t
CreateAllImageInfosPayload(const lldb::ProcessSP &process_sp,
offset_t initial_file_offset,
StreamString &all_image_infos_payload,
- const lldb_private::SaveCoreOptions &options) {
+ lldb_private::SaveCoreOptions &options) {
Target &target = process_sp->GetTarget();
ModuleList modules = target.GetImages();
@@ -6522,16 +6522,17 @@ struct page_object {
};
bool ObjectFileMachO::SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
Status &error) {
- auto core_style = options.GetStyle();
- if (core_style == SaveCoreStyle::eSaveCoreUnspecified)
- core_style = SaveCoreStyle::eSaveCoreDirtyOnly;
// The FileSpec and Process are already checked in PluginManager::SaveCore.
assert(options.GetOutputFile().has_value());
assert(process_sp);
const FileSpec outfile = options.GetOutputFile().value();
+ // MachO defaults to dirty pages
+ if (options.GetStyle() == SaveCoreStyle::eSaveCoreUnspecified)
+ options.SetStyle(eSaveCoreDirtyOnly);
+
Target &target = process_sp->GetTarget();
const ArchSpec target_arch = target.GetArchitecture();
const llvm::Triple &target_triple = target_arch.GetTriple();
diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
index e7af90e28bc4b7..27bc237aaac48d 100644
--- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
+++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.h
@@ -62,7 +62,7 @@ class ObjectFileMachO : public lldb_private::ObjectFile {
lldb_private::ModuleSpecList &specs);
static bool SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
lldb_private::Status &error);
static bool MagicBytesMatch(lldb::DataBufferSP data_sp, lldb::addr_t offset,
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
index c039492aa5c5a6..fc1af24819e969 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
@@ -76,7 +76,7 @@ class MinidumpFileBuilder {
public:
MinidumpFileBuilder(lldb::FileUP &&core_file,
const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &save_core_options)
+ lldb_private::SaveCoreOptions &save_core_options)
: m_process_sp(process_sp), m_core_file(std::move(core_file)),
m_save_core_options(save_core_options){};
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
index 2380ff4c00ca9f..0897895e6bc25d 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
@@ -56,16 +56,15 @@ size_t ObjectFileMinidump::GetModuleSpecifications(
}
bool ObjectFileMinidump::SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
lldb_private::Status &error) {
// Output file and process_sp are both checked in PluginManager::SaveCore.
assert(options.GetOutputFile().has_value());
assert(process_sp);
// Minidump defaults to stacks only.
- SaveCoreStyle core_style = options.GetStyle();
- if (core_style == SaveCoreStyle::eSaveCoreUnspecified)
- core_style = SaveCoreStyle::eSaveCoreStackOnly;
+ if (options.GetStyle() == SaveCoreStyle::eSaveCoreUnspecified)
+ options.SetStyle(SaveCoreStyle::eSaveCoreStackOnly);
llvm::Expected<lldb::FileUP> maybe_core_file = FileSystem::Instance().Open(
options.GetOutputFile().value(),
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
index 0cd31a0e482d5f..b76fcd0052a8a8 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.h
@@ -55,7 +55,7 @@ class ObjectFileMinidump : public
lldb_private::PluginInterface {
// Saves dump in Minidump file format
static bool SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
lldb_private::Status &error);
private:
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
index bda691ade8af02..9d01089745dfc9 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
@@ -355,7 +355,7 @@ size_t ObjectFilePECOFF::GetModuleSpecifications(
}
bool ObjectFilePECOFF::SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
lldb_private::Status &error) {
// Outfile and process_sp are validated by PluginManager::SaveCore
assert(options.GetOutputFile().has_value());
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
index 2eb2b3b7745380..8bccf3be3e5f63 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h
@@ -82,7 +82,7 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
lldb_private::ModuleSpecList &specs);
static bool SaveCore(const lldb::ProcessSP &process_sp,
- const lldb_private::SaveCoreOptions &options,
+ lldb_private::SaveCoreOptions &options,
lldb_private::Status &error);
static bool MagicBytesMatch(lldb::DataBufferSP data_sp);
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
index 61cd74da222235..a6462625fb5b5a 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.cpp
@@ -21,8 +21,7 @@
namespace lldb_private {
bool SaveMiniDump(const lldb::ProcessSP &process_sp,
- const SaveCoreOptions &core_options,
- lldb_private::Status &error) {
+ SaveCoreOptions &core_options, lldb_private::Status &error) {
if (!process_sp)
return false;
#ifdef _WIN32
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h
b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h
index 03c0ece3061431..2f8606d82c974b 100644
--- a/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h
+++ b/lldb/source/Plugins/ObjectFile/PECOFF/WindowsMiniDump.h
@@ -14,8 +14,7 @@
namespace lldb_private {
bool SaveMiniDump(const lldb::ProcessSP &process_sp,
- const SaveCoreOptions &core_options,
- lldb_private::Status &error);
+ SaveCoreOptions &core_options, lldb_private::Status &error);
} // namespace lldb_private
diff --git
a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
index 8573d157339277..c933e01424f568 100644
--- a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
+++ b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
@@ -10,6 +10,11 @@
class ProcessSaveCoreTestCase(TestBase):
+ def validate_core_pid(self, pid, core_path):
+ target = self.dbg.CreateTarget(None)
+ process = target.LoadCore(core_path)
+ return process.GetProcessID() == pid
+
@skipIfRemote
@skipUnlessWindows
def test_cannot_save_core_unless_process_stopped(self):
@@ -88,3 +93,24 @@ def test_save_core_via_process_plugin(self):
os.unlink(core)
except OSError:
pass
+
+ @skipUnlessPlatform(["linux"])
+ def test_save_core_default_values_for_style_minidump(self):
+ """Test we can still save a core for minidump when no
+ core style is specified."""
+ self.build()
+ exe = self.getBuildArtifact("a.out")
+ core = self.getBuildArtifact("core.dmp")
+ target = self.dbg.CreateTarget(exe)
+ target.BreakpointCreateByName("bar")
+ process = target.LaunchSimple(None, None,
self.get_process_working_directory())
+ self.assertState(process.GetState(), lldb.eStateStopped)
+ pid = process.GetProcessID()
+ options = lldb.SBSaveCoreOptions()
+ minidump_path = core + ".minidump"
+ options.SetOutputFile(lldb.SBFileSpec(minidump_path))
+ options.SetPluginName("minidump")
+ error = process.SaveCore(options)
+ self.assertSuccess(error, error.GetCString())
+ self.assertTrue(os.path.isfile(minidump_path))
+ self.assertTrue(self.validate_core_pid(pid, minidump_path))
>From 2b688bae948af94cdc4f88a08ea6f36a03a3bfe8 Mon Sep 17 00:00:00 2001
From: Jacob Lalonde <jalalo...@fb.com>
Date: Mon, 5 Aug 2024 10:09:16 -0700
Subject: [PATCH 3/4] Move test to TestProcessSaveCoreMinidump and add a memory
region check
---
.../ObjectFile/Minidump/MinidumpFileBuilder.h | 2 +-
.../process_save_core/TestProcessSaveCore.py | 26 --------
.../TestProcessSaveCoreMinidump.py | 64 +++++++++++++++++++
.../process_save_core_minidump/main.cpp | 3 +
4 files changed, 68 insertions(+), 27 deletions(-)
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
index fc1af24819e969..762de83db5a39c 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
+++ b/lldb/source/Plugins/ObjectFile/Minidump/MinidumpFileBuilder.h
@@ -78,7 +78,7 @@ class MinidumpFileBuilder {
const lldb::ProcessSP &process_sp,
lldb_private::SaveCoreOptions &save_core_options)
: m_process_sp(process_sp), m_core_file(std::move(core_file)),
- m_save_core_options(save_core_options){};
+ m_save_core_options(save_core_options){}
MinidumpFileBuilder(const MinidumpFileBuilder &) = delete;
MinidumpFileBuilder &operator=(const MinidumpFileBuilder &) = delete;
diff --git
a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
index c933e01424f568..8573d157339277 100644
--- a/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
+++ b/lldb/test/API/functionalities/process_save_core/TestProcessSaveCore.py
@@ -10,11 +10,6 @@
class ProcessSaveCoreTestCase(TestBase):
- def validate_core_pid(self, pid, core_path):
- target = self.dbg.CreateTarget(None)
- process = target.LoadCore(core_path)
- return process.GetProcessID() == pid
-
@skipIfRemote
@skipUnlessWindows
def test_cannot_save_core_unless_process_stopped(self):
@@ -93,24 +88,3 @@ def test_save_core_via_process_plugin(self):
os.unlink(core)
except OSError:
pass
-
- @skipUnlessPlatform(["linux"])
- def test_save_core_default_values_for_style_minidump(self):
- """Test we can still save a core for minidump when no
- core style is specified."""
- self.build()
- exe = self.getBuildArtifact("a.out")
- core = self.getBuildArtifact("core.dmp")
- target = self.dbg.CreateTarget(exe)
- target.BreakpointCreateByName("bar")
- process = target.LaunchSimple(None, None,
self.get_process_working_directory())
- self.assertState(process.GetState(), lldb.eStateStopped)
- pid = process.GetProcessID()
- options = lldb.SBSaveCoreOptions()
- minidump_path = core + ".minidump"
- options.SetOutputFile(lldb.SBFileSpec(minidump_path))
- options.SetPluginName("minidump")
- error = process.SaveCore(options)
- self.assertSuccess(error, error.GetCString())
- self.assertTrue(os.path.isfile(minidump_path))
- self.assertTrue(self.validate_core_pid(pid, minidump_path))
diff --git
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
index 2e1521cd79fb98..0fe2e1c38b1c7c 100644
---
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
+++
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
@@ -254,3 +254,67 @@ def test_save_linux_mini_dump_thread_options(self):
self.assertTrue(self.dbg.DeleteTarget(target))
if os.path.isfile(thread_subset_dmp):
os.unlink(thread_subset_dmp)
+
+ @skipUnlessArch("x86_64")
+ @skipUnlessPlatform(["linux"])
+ def test_save_linux_mini_dump_thread_default_options(self):
+ """Test that we can save a Linux mini dump with default
SBSaveCoreOptions"""
+
+ self.build()
+ exe = self.getBuildArtifact("a.out")
+ default_value_file = self.getBuildArtifact("core.defaults.dmp")
+ try:
+ target = self.dbg.CreateTarget(exe)
+ process = target.LaunchSimple(
+ None, None, self.get_process_working_directory()
+ )
+ self.assertState(process.GetState(), lldb.eStateStopped)
+
+ # This is almost identical to the single thread test case because
+ # minidump defaults to stacks only, so we want to see if the
+ # default options work as expected.
+ options = lldb.SBSaveCoreOptions()
+ default_value_spec = lldb.SBFileSpec(default_value_file)
+ options.SetOutputFile(default_value_spec)
+ options.SetPluginName("minidump")
+ error = process.SaveCore(options)
+ self.assertTrue(error.Success())
+
+ core_target = self.dbg.CreateTarget(None)
+ core_process = core_target.LoadCore(thread_subset_dmp)
+
+ self.assertTrue(core_process, PROCESS_IS_VALID)
+ self.assertEqual(core_process.GetNumThreads(), 1)
+ saved_thread = core_process.GetThreadAtIndex(0)
+ expected_thread = process.GetThreadAtIndex(0)
+ self.assertEqual(expected_thread.GetThreadID(),
saved_thread.GetThreadID())
+ expected_frame = expected_thread.GetFrameAtIndex(0)
+ expected_sp = expected_frame.GetSP()
+ saved_sp = saved_thread.GetFrameAtIndex(0).GetSP()
+ self.assertEqual(expected_sp, saved_sp)
+ expected_region = lldb.SBMemoryRegionInfo()
+ saved_region = lldb.SBMemoryRegionInfo()
+ error = core_process.GetMemoryRegionInfo(saved_sp, saved_region)
+ self.assertTrue(error.Success(), error.GetCString())
+ error = process.GetMemoryRegionInfo(expected_sp, expected_region)
+ self.assertTrue(error.Success(), error.GetCString())
+ self.assertEqual(
+ expected_region.GetRegionBase(), saved_region.GetRegionBase()
+ )
+ self.assertEqual(
+ expected_region.GetRegionEnd(), saved_region.GetRegionEnd()
+ )
+
+ heap_addr_variable = expected_frame.FindVariable("heap_addr")
+ info = lldb.SBMemoryRegionInfo()
+ error =
process.GetMemoryRegionInfo(heap_addr_variable.GetValueAsUnsigned(), info)
+ self.assertTrue(error.Success(), error.GetCString())
+ # Because the default value is stacks, we shouldn't have the memory
+ # region that the heap allocated array points to.
+ error =
core_process.GetMemoryRegionInfo(heap_addr_variable.GetValueAsUnsigned(), info)
+ self.assertTrue(error.Fail(), error.GetCString())
+
+ finally:
+ self.assertTrue(self.dbg.DeleteTarget(target))
+ if os.path.isfile(default_value_file):
+ os.unlink(default_value_file)
diff --git a/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
b/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
index fa34a371f20647..ce138ff01c7dc0 100644
--- a/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
+++ b/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
@@ -19,6 +19,9 @@ size_t h() {
int main() {
std::thread t1(f);
+ char *heap_pointer = new char[10];
+ uint64_t heap_addr = *heap_pointer;
+ std::cout << "Heap address is " << heap_addr << "\n";
size_t x = h();
t1.join();
>From c22b85a11ccb024b3f56112fad3e8d96ed7be041 Mon Sep 17 00:00:00 2001
From: Jacob Lalonde <jalalo...@fb.com>
Date: Mon, 5 Aug 2024 13:23:26 -0700
Subject: [PATCH 4/4] Have test use existing validation code
---
.../TestProcessSaveCoreMinidump.py | 50 ++++++-------------
.../process_save_core_minidump/main.cpp | 3 --
2 files changed, 16 insertions(+), 37 deletions(-)
diff --git
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
index 0fe2e1c38b1c7c..5abaa05a90f63e 100644
---
a/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
+++
b/lldb/test/API/functionalities/process_save_core_minidump/TestProcessSaveCoreMinidump.py
@@ -257,7 +257,7 @@ def test_save_linux_mini_dump_thread_options(self):
@skipUnlessArch("x86_64")
@skipUnlessPlatform(["linux"])
- def test_save_linux_mini_dump_thread_default_options(self):
+ def test_save_linux_mini_dump_default_options(self):
"""Test that we can save a Linux mini dump with default
SBSaveCoreOptions"""
self.build()
@@ -270,6 +270,20 @@ def test_save_linux_mini_dump_thread_default_options(self):
)
self.assertState(process.GetState(), lldb.eStateStopped)
+ process_info = process.GetProcessInfo()
+ expected_pid = process_info.GetProcessID() if
process_info.IsValid() else -1
+ expected_modules = target.modules
+ expected_threads = []
+ stacks_to_sp_map = {}
+ expected_pid = process.GetProcessInfo().GetProcessID()
+
+ for thread_idx in range(process.GetNumThreads()):
+ thread = process.GetThreadAtIndex(thread_idx)
+ thread_id = thread.GetThreadID()
+ expected_threads.append(thread_id)
+ stacks_to_sp_map[thread_id] = thread.GetFrameAtIndex(0).GetSP()
+
+
# This is almost identical to the single thread test case because
# minidump defaults to stacks only, so we want to see if the
# default options work as expected.
@@ -280,39 +294,7 @@ def test_save_linux_mini_dump_thread_default_options(self):
error = process.SaveCore(options)
self.assertTrue(error.Success())
- core_target = self.dbg.CreateTarget(None)
- core_process = core_target.LoadCore(thread_subset_dmp)
-
- self.assertTrue(core_process, PROCESS_IS_VALID)
- self.assertEqual(core_process.GetNumThreads(), 1)
- saved_thread = core_process.GetThreadAtIndex(0)
- expected_thread = process.GetThreadAtIndex(0)
- self.assertEqual(expected_thread.GetThreadID(),
saved_thread.GetThreadID())
- expected_frame = expected_thread.GetFrameAtIndex(0)
- expected_sp = expected_frame.GetSP()
- saved_sp = saved_thread.GetFrameAtIndex(0).GetSP()
- self.assertEqual(expected_sp, saved_sp)
- expected_region = lldb.SBMemoryRegionInfo()
- saved_region = lldb.SBMemoryRegionInfo()
- error = core_process.GetMemoryRegionInfo(saved_sp, saved_region)
- self.assertTrue(error.Success(), error.GetCString())
- error = process.GetMemoryRegionInfo(expected_sp, expected_region)
- self.assertTrue(error.Success(), error.GetCString())
- self.assertEqual(
- expected_region.GetRegionBase(), saved_region.GetRegionBase()
- )
- self.assertEqual(
- expected_region.GetRegionEnd(), saved_region.GetRegionEnd()
- )
-
- heap_addr_variable = expected_frame.FindVariable("heap_addr")
- info = lldb.SBMemoryRegionInfo()
- error =
process.GetMemoryRegionInfo(heap_addr_variable.GetValueAsUnsigned(), info)
- self.assertTrue(error.Success(), error.GetCString())
- # Because the default value is stacks, we shouldn't have the memory
- # region that the heap allocated array points to.
- error =
core_process.GetMemoryRegionInfo(heap_addr_variable.GetValueAsUnsigned(), info)
- self.assertTrue(error.Fail(), error.GetCString())
+ self.verify_core_file(default_value_file, expected_pid,
expected_modules, expected_threads, stacks_to_sp_map)
finally:
self.assertTrue(self.dbg.DeleteTarget(target))
diff --git a/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
b/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
index ce138ff01c7dc0..fa34a371f20647 100644
--- a/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
+++ b/lldb/test/API/functionalities/process_save_core_minidump/main.cpp
@@ -19,9 +19,6 @@ size_t h() {
int main() {
std::thread t1(f);
- char *heap_pointer = new char[10];
- uint64_t heap_addr = *heap_pointer;
- std::cout << "Heap address is " << heap_addr << "\n";
size_t x = h();
t1.join();
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
