diff options
| author | David Spickett <david.spickett@linaro.org> | 2023-11-28 09:39:16 +0000 |
|---|---|---|
| committer | David Spickett <david.spickett@linaro.org> | 2023-11-28 09:39:37 +0000 |
| commit | b0af8a1ede89e87f737f2a31b6a2e2491e38ac04 (patch) | |
| tree | a40b53a4bea79c7b1c0b288d4daed2d8d91760a6 /lldb/source/Commands/CommandObjectWatchpoint.cpp | |
| parent | 1459c627f0bc1a4938b5b6a7f4c2bdc1f3ec6a2c (diff) | |
| download | llvm-b0af8a1ede89e87f737f2a31b6a2e2491e38ac04.zip llvm-b0af8a1ede89e87f737f2a31b6a2e2491e38ac04.tar.gz llvm-b0af8a1ede89e87f737f2a31b6a2e2491e38ac04.tar.bz2 | |
Revert "[lldb] [mostly NFC] Large WP foundation: WatchpointResources (#68845)"
...and follow ups.
As it has caused test failures on Linux Arm and AArch64:
https://lab.llvm.org/buildbot/#/builders/96/builds/49126
https://lab.llvm.org/buildbot/#/builders/17/builds/45824
```
lldb-shell :: Subprocess/clone-follow-child-wp.test
lldb-shell :: Subprocess/fork-follow-child-wp.test
lldb-shell :: Subprocess/vfork-follow-child-wp.test
```
This reverts commit a6c62bf1a4717accc852463b664cd1012237d334,
commit a0a1ff3ab40e347589b4e27d8fd350c600526735 and commit
fc6b72523f3d73b921690a713e97a433c96066c6.
Diffstat (limited to 'lldb/source/Commands/CommandObjectWatchpoint.cpp')
| -rw-r--r-- | lldb/source/Commands/CommandObjectWatchpoint.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lldb/source/Commands/CommandObjectWatchpoint.cpp b/lldb/source/Commands/CommandObjectWatchpoint.cpp index c80868d..cd1d226 100644 --- a/lldb/source/Commands/CommandObjectWatchpoint.cpp +++ b/lldb/source/Commands/CommandObjectWatchpoint.cpp @@ -918,9 +918,9 @@ protected: if (addr_type == eAddressTypeLoad) { // We're in business. // Find out the size of this variable. - size = m_option_watchpoint.watch_size.GetCurrentValue() == 0 + size = m_option_watchpoint.watch_size == 0 ? valobj_sp->GetByteSize().value_or(0) - : m_option_watchpoint.watch_size.GetCurrentValue(); + : m_option_watchpoint.watch_size; } compiler_type = valobj_sp->GetCompilerType(); } else { @@ -1113,8 +1113,8 @@ protected: return; } - if (m_option_watchpoint.watch_size.GetCurrentValue() != 0) - size = m_option_watchpoint.watch_size.GetCurrentValue(); + if (m_option_watchpoint.watch_size != 0) + size = m_option_watchpoint.watch_size; else size = target->GetArchitecture().GetAddressByteSize(); |