https://github.com/medismailben updated
https://github.com/llvm/llvm-project/pull/154651
>From 5bd75225a9a934be76ce7b337c1defb1e25e9153 Mon Sep 17 00:00:00 2001
From: Med Ismail Bennani <ism...@bennani.ma>
Date: Wed, 20 Aug 2025 17:07:33 -0700
Subject: [PATCH] [lldb/crashlog] Avoid StopAtEntry when launch crashlog in
interactive mode
In 88f409194, we changed the way the crashlog scripted process was
launched since the previous approach required to parse the file twice,
by stopping at entry, setting the crashlog object in the middle of the
scripted process launch and resuming it.
Since then, we've introduced SBScriptObject which allows to pass any
arbitrary python object accross the SBAPI boundary to another scripted
affordance.
This patch make sure of that to include the parse crashlog object into
the scripted process launch info dictionary, which eliviates the need to
stop at entry.
Signed-off-by: Med Ismail Bennani <ism...@bennani.ma>
---
lldb/examples/python/crashlog.py | 11 +++++++----
lldb/examples/python/crashlog_scripted_process.py | 11 ++++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py
index bb20f3a25c1c1..b466be6a62428 100755
--- a/lldb/examples/python/crashlog.py
+++ b/lldb/examples/python/crashlog.py
@@ -1540,13 +1540,19 @@ def load_crashlog_in_scripted_process(debugger,
crashlog_path, options, result):
}
)
)
+
+ crashlog_sd = lldb.SBStructuredData()
+ crashlog_sd.SetGenericValue(
+ lldb.SBScriptObject(crashlog, lldb.eScriptLanguagePython)
+ )
+ structured_data.SetValueForKey("crashlog", crashlog_sd)
+
launch_info = lldb.SBLaunchInfo(None)
launch_info.SetProcessPluginName("ScriptedProcess")
launch_info.SetScriptedProcessClassName(
"crashlog_scripted_process.CrashLogScriptedProcess"
)
launch_info.SetScriptedProcessDictionary(structured_data)
- launch_info.SetLaunchFlags(lldb.eLaunchFlagStopAtEntry)
error = lldb.SBError()
process = target.Launch(launch_info, error)
@@ -1554,9 +1560,6 @@ def load_crashlog_in_scripted_process(debugger,
crashlog_path, options, result):
if not process or error.Fail():
raise InteractiveCrashLogException("couldn't launch Scripted Process",
error)
- process.GetScriptedImplementation().set_crashlog(crashlog)
- process.Continue()
-
if not options.skip_status:
@contextlib.contextmanager
diff --git a/lldb/examples/python/crashlog_scripted_process.py
b/lldb/examples/python/crashlog_scripted_process.py
index f54a8df0479e7..f8a727a1e393a 100644
--- a/lldb/examples/python/crashlog_scripted_process.py
+++ b/lldb/examples/python/crashlog_scripted_process.py
@@ -10,8 +10,7 @@
class CrashLogScriptedProcess(ScriptedProcess):
- def set_crashlog(self, crashlog):
- self.crashlog = crashlog
+ def parse_crashlog(self):
if self.crashlog.process_id:
if type(self.crashlog.process_id) is int:
self.pid = self.crashlog.process_id
@@ -29,7 +28,7 @@ def set_crashlog(self, crashlog):
if hasattr(self.crashlog, "asb"):
self.extended_thread_info = self.crashlog.asb
- crashlog.load_images(self.options, self.loaded_images)
+ self.crashlog.load_images(self.options, self.loaded_images)
for thread in self.crashlog.threads:
if (
@@ -92,10 +91,16 @@ def __init__(self, exe_ctx: lldb.SBExecutionContext, args:
lldb.SBStructuredData
no_parallel_image_loading.GetBooleanValue()
)
+ crashlog = args.GetValueForKey("crashlog")
+ if crashlog and crashlog.IsValid():
+ if crashlog.GetType() == lldb.eStructuredDataTypeGeneric:
+ self.crashlog = crashlog.GetGenericValue()
+
self.pid = super().get_process_id()
self.crashed_thread_idx = 0
self.exception = None
self.extended_thread_info = None
+ self.parse_crashlog()
def read_memory_at_address(
self, addr: int, size: int, error: lldb.SBError
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
