diff options
author | Eric Christopher <echristo@gmail.com> | 2020-07-25 18:42:04 -0700 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2020-07-25 18:42:04 -0700 |
commit | 4b14ef33e81c01632e848e7a67ccc6b11fb4c595 (patch) | |
tree | b7dfdff5f0301284e74e74a098cf347fd4ae6647 /lldb/source/Target/StackFrame.cpp | |
parent | 18975762c1974047baeeacb17879416410012a31 (diff) | |
download | llvm-4b14ef33e81c01632e848e7a67ccc6b11fb4c595.zip llvm-4b14ef33e81c01632e848e7a67ccc6b11fb4c595.tar.gz llvm-4b14ef33e81c01632e848e7a67ccc6b11fb4c595.tar.bz2 |
Temporarily Revert "Unify the return value of GetByteSize to an llvm::Optional<uint64_t> (NFC-ish)"
as it's causing numerous (176) test failures on linux.
This reverts commit 1d9b860fb6a85df33fd52fcacc6a5efb421621bd.
Diffstat (limited to 'lldb/source/Target/StackFrame.cpp')
-rw-r--r-- | lldb/source/Target/StackFrame.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/source/Target/StackFrame.cpp b/lldb/source/Target/StackFrame.cpp index 22bca52..098aed9 100644 --- a/lldb/source/Target/StackFrame.cpp +++ b/lldb/source/Target/StackFrame.cpp @@ -1408,7 +1408,7 @@ ValueObjectSP GetValueForOffset(StackFrame &frame, ValueObjectSP &parent, } int64_t child_offset = child_sp->GetByteOffset(); - int64_t child_size = child_sp->GetByteSize().getValueOr(0); + int64_t child_size = child_sp->GetByteSize(); if (offset >= child_offset && offset < (child_offset + child_size)) { return GetValueForOffset(frame, child_sp, offset - child_offset); @@ -1441,8 +1441,8 @@ ValueObjectSP GetValueForDereferincingOffset(StackFrame &frame, } if (offset >= 0 && uint64_t(offset) >= pointee->GetByteSize()) { - int64_t index = offset / pointee->GetByteSize().getValueOr(1); - offset = offset % pointee->GetByteSize().getValueOr(1); + int64_t index = offset / pointee->GetByteSize(); + offset = offset % pointee->GetByteSize(); const bool can_create = true; pointee = base->GetSyntheticArrayMember(index, can_create); } |