https://github.com/jplehr created
https://github.com/llvm/llvm-project/pull/134872
Reverts llvm/llvm-project#134719
This broke many buildbots
>From d96389666d37d0bdd898e2f1812e89b277a3fb74 Mon Sep 17 00:00:00 2001
From: Jan Patrick Lehr
Date: Tue, 8 Apr 2025 17:52:11 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"[dsymutil]=20Avoid=20copying=20binary?=
=?UTF-8?q?=20swiftmodules=20built=20from=20textual=20(#134=E2=80=A6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 561506144531cf0a760bb437fd74c683931c60ae.
---
lldb/source/Core/Statusline.cpp | 15 +-
.../tools/dsymutil/Inputs/Binary.swiftmodule | Bin 17192 -> 0 bytes
.../dsymutil/Inputs/FromInterface.swiftmodule | Bin 17028 -> 0 bytes
llvm/test/tools/dsymutil/swiftmodule.test | 29 ---
.../dsymutil/yaml-object-address-rewrite.test | 3 -
llvm/tools/dsymutil/CMakeLists.txt| 1 -
llvm/tools/dsymutil/DebugMap.cpp | 8 +-
llvm/tools/dsymutil/DwarfLinkerForBinary.cpp | 16 --
llvm/tools/dsymutil/RelocationMap.h | 1 -
llvm/tools/dsymutil/SwiftModule.cpp | 192 --
llvm/tools/dsymutil/SwiftModule.h | 15 --
11 files changed, 8 insertions(+), 272 deletions(-)
delete mode 100644 llvm/test/tools/dsymutil/Inputs/Binary.swiftmodule
delete mode 100644 llvm/test/tools/dsymutil/Inputs/FromInterface.swiftmodule
delete mode 100644 llvm/test/tools/dsymutil/swiftmodule.test
delete mode 100644 llvm/tools/dsymutil/SwiftModule.cpp
delete mode 100644 llvm/tools/dsymutil/SwiftModule.h
diff --git a/lldb/source/Core/Statusline.cpp b/lldb/source/Core/Statusline.cpp
index a2ecebbefbfb1..b7650503e16bc 100644
--- a/lldb/source/Core/Statusline.cpp
+++ b/lldb/source/Core/Statusline.cpp
@@ -12,7 +12,6 @@
#include "lldb/Host/StreamFile.h"
#include "lldb/Interpreter/CommandInterpreter.h"
#include "lldb/Symbol/SymbolContext.h"
-#include "lldb/Target/Process.h"
#include "lldb/Target/StackFrame.h"
#include "lldb/Utility/AnsiTerminal.h"
#include "lldb/Utility/StreamString.h"
@@ -127,7 +126,9 @@ void Statusline::Redraw(bool update) {
return;
}
- ExecutionContext exe_ctx = m_debugger.GetSelectedExecutionContext();
+ StreamString stream;
+ ExecutionContext exe_ctx =
+ m_debugger.GetCommandInterpreter().GetExecutionContext();
// For colors and progress events, the format entity needs access to the
// debugger, which requires a target in the execution context.
@@ -135,15 +136,9 @@ void Statusline::Redraw(bool update) {
exe_ctx.SetTargetPtr(&m_debugger.GetSelectedOrDummyTarget());
SymbolContext symbol_ctx;
- if (ProcessSP process_sp = exe_ctx.GetProcessSP()) {
-Process::StopLocker stop_locker;
-if (stop_locker.TryLock(&process_sp->GetRunLock())) {
- if (auto frame_sp = exe_ctx.GetFrameSP())
-symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
-}
- }
+ if (auto frame_sp = exe_ctx.GetFrameSP())
+symbol_ctx = frame_sp->GetSymbolContext(eSymbolContextEverything);
- StreamString stream;
if (auto *format = m_debugger.GetStatuslineFormat())
FormatEntity::Format(*format, stream, &symbol_ctx, &exe_ctx, nullptr,
nullptr, false, false);
diff --git a/llvm/test/tools/dsymutil/Inputs/Binary.swiftmodule
b/llvm/test/tools/dsymutil/Inputs/Binary.swiftmodule
deleted file mode 100644
index
7ba817b22b707a23387b728923ae764699578561..
GIT binary patch
literal 0
HcmV?d1
literal 17192
zcmbt*4Rl-8mF~5q_~+iBd*dYFKqirm2P9i|WRnCtmXoV12MmN(A?Bwu%v1>u4Q&At
zLJO~LDoY9o#>l{q22pcHZ6JZ!Re2xSw3YaYY4#v7vais?SPw+z);dqRH(ZUa;_=8biydlZ=$wIHp_o7Y3ijSuFh({Rk@GnmA
zy?B@MEgX{gK_B%JOX`G3H2X$fGU(x-SNRhvO)Q4@@+VTlaffh1;>EWX@dGjbxKHTC
zN|?;S52$<}mQM-CB>t#}7mMrpeu+Oe!S}^@aZ^2;*emo|1Z}#af}!My!JbsAMgrAi
z@l|0%^+?=05ORj%wLZ30EDjW~CMB?_DI7V7AxHG;g
zil+g4C}5w82XE_9tmxRI*hZD=E<;TuZbjEF1zK7aGSti%sw07FEOIx^q1c83)-Hoh
zRctCIkJm&3wq$%&R=G~c^|WeIv5gsOLeR8gb9%z|uDCsdc@*1l+}ee4hMG|l#kOCm
zb^30wj>0Mi`>0a&HhVgwR1F#IBLRDotvIY$u~RJS^xa64N0jOqCW~7mB%N(4P#sd}
zD}b;4&hLswu3jwtlP
zN;sI}k8;A17!M=7=-~%}6j&oAz-*coBPnjp>@bNxpk}e)Ydqo*U}XT|phv(^3_7UN
zlYS53tWV~}@qgxz%lt{qpAw=HJ?#aovVgdBeD-ypUx=poL0NcFBB9fexzz+<3Wrtx
zSV}nIfl$IhKmTHikIKT46dp>2rBxv^zIDP-o83Q91TDZmWEDfrRD4wzw8+e*#uIDz
z7^>kSzl*OLj#m%ISHV1h5io;J&}Ar2${UN@ojb;9nur23SAD>2h<5{ubw57m8bf}Q
ztquShYy`ddssXZu&AI7P`#7yin9O2mh8eUg?k>CY1nl4?2RQ;af%?6CuY=Sx$1J%X
z(lHnXT4PELQ1cRR&47c>wvAuTVNVhse%PM4K?rx`0LZN3(SQxTnPT!6LoYLthVoxE%a1Q;r1(Jmd~T3~+FqBMgjM
zKd~Fw1$kM7BM$yWS$KgHG*}OU-ZGPkZ^?WgUSNI?e++0&@_kAE0F0aMamgfqJjui4
zm_IX3bjgrMh%!G(FZNTHaFPS~vt0zR=1^*4`5}*R%s~>u@iN0xmN`#3aIgR>7r*u!
zjq1~~rlsUU$ZIs0zsPG}
zBQ^xxKvnPn&9f14G_9s3{THJ!n8Irw9x;&d3&b0+7jyr#1;yp2^o}tB*{4S!!MQnu
z(^GD4WWYEK+reZi*3B&O)~+1md#T^SJRue>B?9dw3KS6f
z4$hj6yETIET6azB>3#aXG3enBVI{1`JRfp_fi;p$3;gD-!Z8bf99GAc=0V_u7ly!2
z0EZkv`L;h#Dp$4sTIlAd|rTEhB^^KRxh*YPi4Lf}*z9pevWRdM<4Iu*i<
zGE$1U*1P>$Hh(7ZfDo`GoCVs=;LPy|Vm
