Rename Error -> Status.
This renames the LLDB error class to Status, as discussed
on the lldb-dev mailing list.
A change of this magnitude cannot easily be done without
find and replace, but that has potential to catch unwanted
occurrences of common strings such as "Error". Every effort
was made to find all the obvious things such as the word "Error"
appearing in a string, etc, but it's possible there are still
some lingering occurences left around. Hopefully nothing too
serious.
llvm-svn: 302872
diff --git a/lldb/source/Expression/IRMemoryMap.cpp b/lldb/source/Expression/IRMemoryMap.cpp
index 66510ac..817c75e 100644
--- a/lldb/source/Expression/IRMemoryMap.cpp
+++ b/lldb/source/Expression/IRMemoryMap.cpp
@@ -14,9 +14,9 @@
#include "lldb/Target/Target.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/DataExtractor.h"
-#include "lldb/Utility/Error.h"
#include "lldb/Utility/LLDBAssert.h"
#include "lldb/Utility/Log.h"
+#include "lldb/Utility/Status.h"
using namespace lldb_private;
@@ -31,7 +31,7 @@
if (process_sp) {
AllocationMap::iterator iter;
- Error err;
+ Status err;
while ((iter = m_allocations.begin()) != m_allocations.end()) {
err.Clear();
@@ -66,7 +66,7 @@
return ret;
if (process_is_alive && process_sp->CanJIT()) {
- Error alloc_error;
+ Status alloc_error;
ret = process_sp->AllocateMemory(size, lldb::ePermissionsReadable |
lldb::ePermissionsWritable,
@@ -104,7 +104,7 @@
end_of_memory != 0xffffffffull);
MemoryRegionInfo region_info;
- Error err = process_sp->GetMemoryRegionInfo(ret, region_info);
+ Status err = process_sp->GetMemoryRegionInfo(ret, region_info);
if (err.Success()) {
while (true) {
if (region_info.GetReadable() != MemoryRegionInfo::OptionalBool::eNo ||
@@ -297,7 +297,7 @@
lldb::addr_t IRMemoryMap::Malloc(size_t size, uint8_t alignment,
uint32_t permissions, AllocationPolicy policy,
- bool zero_memory, Error &error) {
+ bool zero_memory, Status &error) {
lldb_private::Log *log(
lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
error.Clear();
@@ -397,7 +397,7 @@
permissions, alignment, policy);
if (zero_memory) {
- Error write_error;
+ Status write_error;
std::vector<uint8_t> zero_buf(size, 0);
WriteMemory(aligned_address, zero_buf.data(), size, write_error);
}
@@ -429,7 +429,7 @@
return aligned_address;
}
-void IRMemoryMap::Leak(lldb::addr_t process_address, Error &error) {
+void IRMemoryMap::Leak(lldb::addr_t process_address, Status &error) {
error.Clear();
AllocationMap::iterator iter = m_allocations.find(process_address);
@@ -445,7 +445,7 @@
allocation.m_leak = true;
}
-void IRMemoryMap::Free(lldb::addr_t process_address, Error &error) {
+void IRMemoryMap::Free(lldb::addr_t process_address, Status &error) {
error.Clear();
AllocationMap::iterator iter = m_allocations.find(process_address);
@@ -512,7 +512,8 @@
}
void IRMemoryMap::WriteMemory(lldb::addr_t process_address,
- const uint8_t *bytes, size_t size, Error &error) {
+ const uint8_t *bytes, size_t size,
+ Status &error) {
error.Clear();
AllocationMap::iterator iter = FindAllocation(process_address, size);
@@ -587,7 +588,7 @@
void IRMemoryMap::WriteScalarToMemory(lldb::addr_t process_address,
Scalar &scalar, size_t size,
- Error &error) {
+ Status &error) {
error.Clear();
if (size == UINT32_MAX)
@@ -612,7 +613,7 @@
}
void IRMemoryMap::WritePointerToMemory(lldb::addr_t process_address,
- lldb::addr_t address, Error &error) {
+ lldb::addr_t address, Status &error) {
error.Clear();
Scalar scalar(address);
@@ -621,7 +622,7 @@
}
void IRMemoryMap::ReadMemory(uint8_t *bytes, lldb::addr_t process_address,
- size_t size, Error &error) {
+ size_t size, Status &error) {
error.Clear();
AllocationMap::iterator iter = FindAllocation(process_address, size);
@@ -717,7 +718,7 @@
void IRMemoryMap::ReadScalarFromMemory(Scalar &scalar,
lldb::addr_t process_address,
- size_t size, Error &error) {
+ size_t size, Status &error) {
error.Clear();
if (size > 0) {
@@ -760,7 +761,7 @@
void IRMemoryMap::ReadPointerFromMemory(lldb::addr_t *address,
lldb::addr_t process_address,
- Error &error) {
+ Status &error) {
error.Clear();
Scalar pointer_scalar;
@@ -777,7 +778,7 @@
void IRMemoryMap::GetMemoryData(DataExtractor &extractor,
lldb::addr_t process_address, size_t size,
- Error &error) {
+ Status &error) {
error.Clear();
if (size > 0) {