Skip to content

Commit 1cd560a

Browse files
committed
mte fixes
1 parent 3b2c065 commit 1cd560a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

lldb/source/Plugins/Process/Linux/NativeThreadLinux.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,14 @@ void NativeThreadLinux::AnnotateSyncTagCheckFault(lldb::addr_t fault_addr) {
326326
}
327327

328328
// We assume that the stop description is currently:
329-
// signal SIGSEGV: sync tag check fault (fault address: <addr>)
329+
// signal SIGSEGV: sync tag check fault (fault address=<addr>)
330330
// Remove the closing )
331331
m_stop_description.pop_back();
332332

333333
std::stringstream ss;
334334
std::unique_ptr<MemoryTagManager> manager(std::move(details->manager));
335335

336-
ss << " logical tag: 0x" << std::hex << manager->GetLogicalTag(fault_addr);
336+
ss << " logical tag=0x" << std::hex << manager->GetLogicalTag(fault_addr);
337337

338338
std::vector<uint8_t> allocation_tag_data;
339339
// The fault address may not be granule aligned. ReadMemoryTags will granule
@@ -347,7 +347,7 @@ void NativeThreadLinux::AnnotateSyncTagCheckFault(lldb::addr_t fault_addr) {
347347
llvm::Expected<std::vector<lldb::addr_t>> allocation_tag =
348348
manager->UnpackTagsData(allocation_tag_data, 1);
349349
if (allocation_tag) {
350-
ss << " allocation tag: 0x" << std::hex << allocation_tag->front() << ")";
350+
ss << " allocation tag=0x" << std::hex << allocation_tag->front() << ")";
351351
} else {
352352
llvm::consumeError(allocation_tag.takeError());
353353
ss << ")";

lldb/test/API/linux/aarch64/mte_tag_faults/TestAArch64LinuxMTEMemoryTagFaults.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ def test_mte_tag_fault_sync(self):
5151
"continue",
5252
patterns=[
5353
"\* thread #1, name = 'a.out', stop reason = signal SIGSEGV: "
54-
"sync tag check fault \(fault address: 0x9[0-9A-Fa-f]+11\ "
55-
"logical tag: 0x9 allocation tag: 0xa\)"
54+
"sync tag check fault \(fault address=0x9[0-9A-Fa-f]+11\ "
55+
"logical tag=0x9 allocation tag=0xa\)"
5656
],
5757
)
5858

0 commit comments

Comments
 (0)