Merge remote-tracking branch 'origin/GP-0_d-millar_test_failures_pt2'

This commit is contained in:
Ryan Kurtz 2025-01-13 05:45:37 -05:00
commit eaa2a5c6b3

View file

@ -1314,8 +1314,9 @@ def ghidra_trace_put_all():
STATE.require_tx() STATE.require_tx()
with STATE.client.batch() as b: with STATE.client.batch() as b:
put_environment() put_environment()
put_regions() if hasattr(drgn, 'RelocatableModule'):
put_modules() put_regions()
put_modules()
syms = SYMBOLS_PATTERN.format(procnum=util.selected_process()) syms = SYMBOLS_PATTERN.format(procnum=util.selected_process())
sobj = STATE.trace.create_object(syms) sobj = STATE.trace.create_object(syms)
sobj.insert() sobj.insert()