Vendor import of stripped lldb trunk r256633:

https://llvm.org/svn/llvm-project/lldb/trunk@256633

1 files changed, 9 insertions, 17 deletions

diff --git a/source/Target/Memory.cpp b/source/Target/Memory.cpp
index e61b3ab91e7b..c89fd5101147 100644
--- a/source/Target/Memory.cpp
+++ b/source/Target/Memory.cpp
@@ -164,24 +164,16 @@ MemoryCache::Read (addr_t addr,
     if (!m_L1_cache.empty())
     {
         AddrRange read_range(addr, dst_len);
-        BlockMap::iterator pos = m_L1_cache.lower_bound(addr);
-        if (pos != m_L1_cache.end())
+        BlockMap::iterator pos = m_L1_cache.upper_bound(addr);
+        if (pos != m_L1_cache.begin ())
         {
-            AddrRange chunk_range(pos->first, pos->second->GetByteSize());
-            bool match = chunk_range.Contains(read_range);
-            if (!match && pos != m_L1_cache.begin())
-            {
-                --pos;
-                chunk_range.SetRangeBase(pos->first);
-                chunk_range.SetByteSize(pos->second->GetByteSize());
-                match = chunk_range.Contains(read_range);
-            }
-
-            if (match)
-            {
-                memcpy(dst, pos->second->GetBytes() + addr - chunk_range.GetRangeBase(), dst_len);
-                return dst_len;
-            }
+            --pos;
+        }
+        AddrRange chunk_range(pos->first, pos->second->GetByteSize());
+        if (chunk_range.Contains(read_range))
+        {
+            memcpy(dst, pos->second->GetBytes() + addr - chunk_range.GetRangeBase(), dst_len);
+            return dst_len;
         }
     }