averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Reflection] Make both MemoryReader::readBytes methods virtual and provide a default implementation for both to allow subclasses to smoothly transition from overriding the old one to overriding the new one.

Browse Source 
rdar://problem/37538580
This commit is contained in:
Mike Ash
2018-02-22 17:17:00 -05:00
parent 89d9f2ba82
commit 9aa24e8be7
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/swift/Remote/MemoryReader.h
View File

@@ -42,13 +42,6 @@ public:
/// Look up the given public symbol name in the remote process.
virtual RemoteAddress getSymbolAddress(const std::string &name) = 0;
/// Attempts to read 'size' bytes from the given address in the remote process.
///
/// Returns a pointer to the requested data and a function that must be called to
/// free that data when done. The pointer will be NULL if the operation failed.
virtual std::tuple<const void *, std::function<void()>>
readBytes(RemoteAddress address, uint64_t size) = 0;
/// Attempts to read a C string from the given address in the remote
/// process.
///
@@ -65,11 +58,32 @@ public:
sizeof(IntegerType));
}
/// Attempts to read 'size' bytes from the given address in the remote process.
///
/// Returns a pointer to the requested data and a function that must be called to
/// free that data when done. The pointer will be NULL if the operation failed.
///
/// NOTE: subclasses MUST override at least one of the readBytes functions. The default
/// implementation calls through to the other one.
virtual std::tuple<const void *, std::function<void()>>
readBytes(RemoteAddress address, uint64_t size) {
void *buffer = malloc(size);
bool success = readBytes(address, reinterpret_cast<uint8_t *>(buffer), size);
if (!success) {
free(buffer);
return std::make_tuple(nullptr, []{});
}
return std::make_tuple(nullptr, [=]{ free(buffer); });
}
/// Attempts to read 'size' bytes from the given address in the
/// remote process.
///
/// Returns false if the operation failed.
bool readBytes(RemoteAddress address, uint8_t *dest, uint64_t size) {
///
/// NOTE: subclasses MUST override at least one of the readBytes functions. The default
/// implementation calls through to the other one.
virtual bool readBytes(RemoteAddress address, uint8_t *dest, uint64_t size) {
const void *ptr;
std::function<void()> freeFunc;
std::tie(ptr, freeFunc) = readBytes(address, size);