From 810c3cfa664b38b27bc30afaadab3d775cb17922 Mon Sep 17 00:00:00 2001 From: Jim Ingham Date: Fri, 20 Dec 2019 10:56:39 -0800 Subject: [PATCH] ThreadPlanTracer::TracingStarted can't call virtual methods on Thread. TracingStarted gets called in the Thread constructor, which means you can't call a virtual method of the class. So delay setting up the m_register_values till you need them. NFC as lldb just crashes if you don't do this. The thread tracing is an only occasionally useful feature, and it only sort of works. I'm not adding tests etc. at this point, I'm just poking at it a bit. If I get it working better I'll write tests and so forth. --- lldb/source/Target/ThreadPlanTracer.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lldb/source/Target/ThreadPlanTracer.cpp b/lldb/source/Target/ThreadPlanTracer.cpp index 5782fe8..b50c163 100644 --- a/lldb/source/Target/ThreadPlanTracer.cpp +++ b/lldb/source/Target/ThreadPlanTracer.cpp @@ -115,10 +115,6 @@ TypeFromUser ThreadPlanAssemblyTracer::GetIntPointerType() { ThreadPlanAssemblyTracer::~ThreadPlanAssemblyTracer() = default; void ThreadPlanAssemblyTracer::TracingStarted() { - RegisterContext *reg_ctx = m_thread.GetRegisterContext().get(); - - if (m_register_values.empty()) - m_register_values.resize(reg_ctx->GetRegisterCount()); } void ThreadPlanAssemblyTracer::TracingEnded() { m_register_values.clear(); } @@ -208,6 +204,11 @@ void ThreadPlanAssemblyTracer::Log() { } } + if (m_register_values.empty()) { + RegisterContext *reg_ctx = m_thread.GetRegisterContext().get(); + m_register_values.resize(reg_ctx->GetRegisterCount()); + } + RegisterValue reg_value; for (uint32_t reg_num = 0, num_registers = reg_ctx->GetRegisterCount(); reg_num < num_registers; ++reg_num) { -- 2.7.4