Skip to content

Commit d0900fa

Browse files
committed
Add the swift specific changes required to cherry-pick:
076341d
1 parent 69735d5 commit d0900fa

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

lldb/source/Plugins/InstrumentationRuntime/SwiftRuntimeReporting/SwiftRuntimeReporting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ SwiftRuntimeReporting::RetrieveReportData(ExecutionContextRef exe_ctx_ref) {
205205
return StructuredData::ObjectSP();
206206

207207
ThreadSP thread_sp = exe_ctx_ref.GetThreadSP();
208-
StackFrameSP frame_sp = thread_sp->GetSelectedFrame();
208+
StackFrameSP frame_sp = thread_sp->GetSelectedFrame(DoNoSelectMostRelevantFrame);
209209
ModuleSP runtime_module_sp = GetRuntimeModuleSP();
210210
Target &target = process_sp->GetTarget();
211211

lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3594,7 +3594,7 @@ bool RenderScriptRuntime::GetKernelCoordinate(RSCoordinate &coord,
35943594
if (!thread_ptr->SetSelectedFrameByIndex(i))
35953595
continue;
35963596

3597-
StackFrameSP frame_sp = thread_ptr->GetSelectedFrame();
3597+
StackFrameSP frame_sp = thread_ptr->GetSelectedFrame(DoNoSelectMostRelevantFrame);
35983598
if (!frame_sp)
35993599
continue;
36003600

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,8 @@ SwiftLanguageRuntimeImpl::GetObjectDescriptionExpr_Copy(ValueObject &object,
980980
StackFrameSP frame_sp = object.GetFrameSP();
981981
if (!frame_sp)
982982
frame_sp
983-
= m_process.GetThreadList().GetSelectedThread()->GetSelectedFrame();
983+
= m_process.GetThreadList().GetSelectedThread()
984+
->GetSelectedFrame(DoNoSelectMostRelevantFrame);
984985

985986
auto swift_ast_ctx =
986987
static_type.GetTypeSystem().dyn_cast_or_null<TypeSystemSwift>();
@@ -1044,7 +1045,8 @@ SwiftLanguageRuntimeImpl::RunObjectDescriptionExpr(ValueObject &object,
10441045
StackFrameSP frame_sp = object.GetFrameSP();
10451046
if (!frame_sp)
10461047
frame_sp
1047-
= m_process.GetThreadList().GetSelectedThread()->GetSelectedFrame();
1048+
= m_process.GetThreadList().GetSelectedThread()
1049+
->GetSelectedFrame(DoNoSelectMostRelevantFrame);
10481050
auto eval_result = m_process.GetTarget().EvaluateExpression(
10491051
expr_string,
10501052
frame_sp.get(),

0 commit comments

Comments
 (0)