Author: Robert O'Callahan Date: 2025-03-21T10:10:54+01:00 New Revision: f89a7fa319ccd903a9db69a9e32e1e63d866c5f8
URL: https://github.com/llvm/llvm-project/commit/f89a7fa319ccd903a9db69a9e32e1e63d866c5f8 DIFF: https://github.com/llvm/llvm-project/commit/f89a7fa319ccd903a9db69a9e32e1e63d866c5f8.diff LOG: [lldb] Ignore registers that the debugserver fails to read (#132122) On Mac x86-64, the debugserver reports a register ('ds' at least) but returns an error when we try to read it. Just skip storing such registers in snapshots so we won't try to restore them. Added: Modified: lldb/packages/Python/lldbsuite/test/lldbreverse.py lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/lldbreverse.py b/lldb/packages/Python/lldbsuite/test/lldbreverse.py index a42cc7cac15d3..d9a8daba3772d 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbreverse.py +++ b/lldb/packages/Python/lldbsuite/test/lldbreverse.py @@ -300,7 +300,10 @@ def capture_snapshot(self): for index in sorted(self.general_purpose_register_info.keys()): reply = self.pass_through(f"p{index:x};thread:{thread_id:x};") if reply == "" or reply[0] == "E": - raise ValueError("Can't read register") + # Mac debugserver tells us about registers that it won't let + # us actually read. Ignore those registers. + self.logger.debug(f"Failed to read register {index:x}") + continue registers[index] = reply thread_snapshot = ThreadSnapshot(thread_id, registers) thread_sp = self.get_register( diff --git a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py index 1ff645b94d2eb..a159e0f716dbe 100644 --- a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py +++ b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueBreakpoints.py @@ -11,13 +11,11 @@ class TestReverseContinueBreakpoints(ReverseTestBase): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue(self): self.reverse_continue_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_async(self): self.reverse_continue_internal(async_mode=True) @@ -47,13 +45,11 @@ def reverse_continue_internal(self, async_mode): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_breakpoint(self): self.reverse_continue_breakpoint_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_breakpoint_async(self): self.reverse_continue_breakpoint_internal(async_mode=True) @@ -72,13 +68,11 @@ def reverse_continue_breakpoint_internal(self, async_mode): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_skip_breakpoint(self): self.reverse_continue_skip_breakpoint_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_skip_breakpoint_async(self): self.reverse_continue_skip_breakpoint_internal(async_mode=True) @@ -104,13 +98,11 @@ def reverse_continue_skip_breakpoint_internal(self, async_mode): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_continue_preserves_direction(self): self.continue_preserves_direction_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_continue_preserves_direction_asyhc(self): self.continue_preserves_direction_internal(async_mode=True) diff --git a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py index 519f1cb23604d..c942f2a0386e5 100644 --- a/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py +++ b/lldb/test/API/functionalities/reverse-execution/TestReverseContinueWatchpoints.py @@ -11,13 +11,11 @@ class TestReverseContinueWatchpoints(ReverseTestBase): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_watchpoint(self): self.reverse_continue_watchpoint_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_watchpoint_async(self): self.reverse_continue_watchpoint_internal(async_mode=True) @@ -63,13 +61,11 @@ def reverse_continue_watchpoint_internal(self, async_mode): @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_skip_watchpoint(self): self.reverse_continue_skip_watchpoint_internal(async_mode=False) @skipIfRemote @skipIf(macos_version=["<", "15.0"]) - @skipIf(oslist=lldbplatformutil.getDarwinOSTriples(), archs=["x86_64"]) def test_reverse_continue_skip_watchpoint_async(self): self.reverse_continue_skip_watchpoint_internal(async_mode=True) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
