diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2013-05-24 10:54:58 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2013-05-24 10:54:58 +0000 |
| commit | 534d3a467085d9be5b4cbe7d59f3ee5bec61fc7c (patch) | |
| tree | 6f726e83a5c98d74381fe3aad9041ed92e9edb3b /llvm/lib/Support/StringRefMemoryObject.cpp | |
| parent | 01a8079bf2aea993f3dc6d751626bfd7ddb1f11e (diff) | |
| download | bcm5719-llvm-534d3a467085d9be5b4cbe7d59f3ee5bec61fc7c.tar.gz bcm5719-llvm-534d3a467085d9be5b4cbe7d59f3ee5bec61fc7c.zip | |
Remove the Copied parameter from MemoryObject::readBytes.
There was exactly one caller using this API right, the others were relying on
specific behavior of the default implementation. Since it's too hard to use it
right just remove it and standardize on the default behavior.
Defines away PR16132.
llvm-svn: 182636
Diffstat (limited to 'llvm/lib/Support/StringRefMemoryObject.cpp')
| -rw-r--r-- | llvm/lib/Support/StringRefMemoryObject.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/llvm/lib/Support/StringRefMemoryObject.cpp b/llvm/lib/Support/StringRefMemoryObject.cpp index 5db11e918cd..e035ed1d2ef 100644 --- a/llvm/lib/Support/StringRefMemoryObject.cpp +++ b/llvm/lib/Support/StringRefMemoryObject.cpp @@ -20,15 +20,10 @@ int StringRefMemoryObject::readByte(uint64_t Addr, uint8_t *Byte) const { int StringRefMemoryObject::readBytes(uint64_t Addr, uint64_t Size, - uint8_t *Buf, - uint64_t *Copied) const { - if (Addr >= Base + getExtent() || Addr < Base) - return -1; + uint8_t *Buf) const { uint64_t Offset = Addr - Base; - if (Size > getExtent() - Offset) - Size = getExtent() - Offset; + if (Addr >= Base + getExtent() || Offset + Size > getExtent() || Addr < Base) + return -1; memcpy(Buf, Bytes.data() + Offset, Size); - if (Copied) - *Copied = Size; return 0; } |

