Skip to content

Commit 2598427

Browse files
committed
Fix tests for the entire string and run GCF
1 parent c3691a8 commit 2598427

File tree

6 files changed

+8
-10
lines changed

6 files changed

+8
-10
lines changed

lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ Status ELFLinuxSigInfo::Parse(const DataExtractor &data, const ArchSpec &arch) {
573573
addr = data.GetAddress(&offset);
574574
addr_lsb = data.GetU16(&offset);
575575
}
576-
576+
577577
return error;
578578
}
579579

@@ -582,7 +582,6 @@ std::string ELFLinuxSigInfo::GetDescription() {
582582
return lldb_private::UnixSignals::CreateForHost()->GetSignalDescription(
583583
si_signo, si_code, reinterpret_cast<uintptr_t>(addr));
584584

585-
586585
return lldb_private::UnixSignals::CreateForHost()->GetSignalDescription(
587-
si_signo, si_code);
586+
si_signo, si_code);
588587
}

lldb/source/Plugins/Process/elf-core/ThreadElfCore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ struct ELFLinuxSigInfo {
7979
int32_t si_signo; // Order matters for the first 3.
8080
int32_t si_errno;
8181
int32_t si_code;
82-
lldb::addr_t addr; /* faulting insn/memory ref. */
83-
int32_t addr_lsb; /* Valid LSB of the reported address. */
82+
lldb::addr_t addr; /* faulting insn/memory ref. */
83+
int32_t addr_lsb; /* Valid LSB of the reported address. */
8484

8585
ELFLinuxSigInfo();
8686

lldb/test/API/linux/aarch64/mte_core_file/TestAArch64LinuxMTEMemoryTagCoreFile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,7 @@ def test_mte_tag_fault_reason(self):
216216
self.expect(
217217
"bt",
218218
substrs=[
219-
"* thread #1, name = 'a.out.mte', stop reason = signal SIGSEGV: "
220-
"sync tag check fault"
219+
"* thread #1, name = 'a.out.mte', stop reason = SIGSEGV: sync tag check fault (fault address: 0xffff82c74010)"
221220
],
222221
)
223222

lldb/test/API/linux/aarch64/non_address_bit_memory_access/TestAArch64LinuxNonAddressBitMemoryAccess.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def test_non_address_bit_memory_caching(self):
199199
def test_non_address_bit_memory_corefile(self):
200200
self.runCmd("target create --core corefile")
201201

202-
self.expect("thread list", substrs=["stopped", "stop reason = signal SIGSEGV"])
202+
self.expect("thread list", substrs=["stopped", "stop reason = SIGSEGV: address not mapped to object (fault address: 0x0)"])
203203

204204
# No caching (the program/corefile are the cache) and no writing
205205
# to memory. So just check that tagged/untagged addresses read

lldb/test/Shell/Register/Core/x86-32-linux-multithread.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: %lldb -b -s %s -c %p/Inputs/x86-32-linux-multithread.core | FileCheck %s
22

33
thread list
4-
# CHECK: * thread #1: tid = 330633, 0x080492d2, name = 'a.out', stop reason = signal SIGSEGV
4+
# CHECK: * thread #1: tid = 330633, 0x080492d2, name = 'a.out', stop reason = SIGSEGV: address not mapped to object (fault address: 0x0)
55
# CHECK-NEXT: thread #2: tid = 330634, 0x080492dd, stop reason = signal 0
66
# CHECK-NEXT: thread #3: tid = 330635, 0x080492dd, stop reason = signal 0
77
# CHECK-NEXT: thread #4: tid = 330632, 0xf7f59549, stop reason = signal 0

lldb/test/Shell/Register/Core/x86-64-linux-multithread.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# RUN: %lldb -b -s %s -c %p/Inputs/x86-64-linux-multithread.core | FileCheck %s
22

33
thread list
4-
# CHECK: * thread #1: tid = 329384, 0x0000000000401262, name = 'a.out', stop reason = signal SIGSEGV
4+
# CHECK: * thread #1: tid = 329384, 0x0000000000401262, name = 'a.out', stop reason = SIGSEGV: address not mapped to object (fault address: 0x0)
55
# CHECK-NEXT: thread #2: tid = 329385, 0x000000000040126d, stop reason = signal 0
66
# CHECK-NEXT: thread #3: tid = 329386, 0x000000000040126d, stop reason = signal 0
77
# CHECK-NEXT: thread #4: tid = 329383, 0x00007fcf5582f762, stop reason = signal 0

0 commit comments

Comments
 (0)