Replace 'ap' with 'up' suffix in variable names. (NFC)
The `ap` suffix is a remnant of lldb's former use of auto pointers,
before they got deprecated. Although all their uses were replaced by
unique pointers, some variables still carried the suffix.
In r353795 I removed another auto_ptr remnant, namely redundant calls to
::get for unique_pointers. Jim justly noted that this is a good
opportunity to clean up the variable names as well.
I went over all the changes to ensure my find-and-replace didn't have
any undesired side-effects. I hope I didn't miss any, but if you end up
at this commit doing a git blame on a weirdly named variable, please
know that the change was unintentional.
llvm-svn: 353912
diff --git a/lldb/source/Expression/IRExecutionUnit.cpp b/lldb/source/Expression/IRExecutionUnit.cpp
index 19b3d07..6528a27 100644
--- a/lldb/source/Expression/IRExecutionUnit.cpp
+++ b/lldb/source/Expression/IRExecutionUnit.cpp
@@ -36,14 +36,14 @@
using namespace lldb_private;
-IRExecutionUnit::IRExecutionUnit(std::unique_ptr<llvm::LLVMContext> &context_ap,
- std::unique_ptr<llvm::Module> &module_ap,
+IRExecutionUnit::IRExecutionUnit(std::unique_ptr<llvm::LLVMContext> &context_up,
+ std::unique_ptr<llvm::Module> &module_up,
ConstString &name,
const lldb::TargetSP &target_sp,
const SymbolContext &sym_ctx,
std::vector<std::string> &cpu_features)
- : IRMemoryMap(target_sp), m_context_ap(context_ap.release()),
- m_module_ap(module_ap.release()), m_module(m_module_ap.get()),
+ : IRMemoryMap(target_sp), m_context_up(context_up.release()),
+ m_module_up(module_up.release()), m_module(m_module_up.get()),
m_cpu_features(cpu_features), m_name(name), m_sym_ctx(sym_ctx),
m_did_jit(false), m_function_load_addr(LLDB_INVALID_ADDRESS),
m_function_end_load_addr(LLDB_INVALID_ADDRESS),
@@ -267,10 +267,10 @@
relocModel = llvm::Reloc::PIC_;
}
- m_module_ap->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError,
+ m_module_up->getContext().setInlineAsmDiagnosticHandler(ReportInlineAsmError,
&error);
- llvm::EngineBuilder builder(std::move(m_module_ap));
+ llvm::EngineBuilder builder(std::move(m_module_up));
builder.setEngineKind(llvm::EngineKind::JIT)
.setErrorStr(&error_string)
@@ -289,12 +289,12 @@
llvm::TargetMachine *target_machine =
builder.selectTarget(triple, mArch, mCPU, mAttrs);
- m_execution_engine_ap.reset(builder.create(target_machine));
+ m_execution_engine_up.reset(builder.create(target_machine));
m_strip_underscore =
- (m_execution_engine_ap->getDataLayout().getGlobalPrefix() == '_');
+ (m_execution_engine_up->getDataLayout().getGlobalPrefix() == '_');
- if (!m_execution_engine_ap) {
+ if (!m_execution_engine_up) {
error.SetErrorToGenericError();
error.SetErrorStringWithFormat("Couldn't JIT the function: %s",
error_string.c_str());
@@ -323,15 +323,15 @@
};
if (process_sp->GetTarget().GetEnableSaveObjects()) {
- m_object_cache_ap = llvm::make_unique<ObjectDumper>();
- m_execution_engine_ap->setObjectCache(m_object_cache_ap.get());
+ m_object_cache_up = llvm::make_unique<ObjectDumper>();
+ m_execution_engine_up->setObjectCache(m_object_cache_up.get());
}
// Make sure we see all sections, including ones that don't have
// relocations...
- m_execution_engine_ap->setProcessAllSections(true);
+ m_execution_engine_up->setProcessAllSections(true);
- m_execution_engine_ap->DisableLazyCompilation();
+ m_execution_engine_up->DisableLazyCompilation();
for (llvm::Function &function : *m_module) {
if (function.isDeclaration() || function.hasPrivateLinkage())
@@ -340,7 +340,7 @@
const bool external =
function.hasExternalLinkage() || function.hasLinkOnceODRLinkage();
- void *fun_ptr = m_execution_engine_ap->getPointerToFunction(&function);
+ void *fun_ptr = m_execution_engine_up->getPointerToFunction(&function);
if (!error.Success()) {
// We got an error through our callback!
@@ -359,7 +359,7 @@
}
CommitAllocations(process_sp);
- ReportAllocations(*m_execution_engine_ap);
+ ReportAllocations(*m_execution_engine_up);
// We have to do this after calling ReportAllocations because for the MCJIT,
// getGlobalValueAddress will cause the JIT to perform all relocations. That
@@ -371,7 +371,7 @@
llvm::GlobalValue &val) {
if (val.hasExternalLinkage() && !val.isDeclaration()) {
uint64_t var_ptr_addr =
- m_execution_engine_ap->getGlobalValueAddress(val.getName().str());
+ m_execution_engine_up->getGlobalValueAddress(val.getName().str());
lldb::addr_t remote_addr = GetRemoteAddressForLocal(var_ptr_addr);
@@ -488,13 +488,13 @@
}
IRExecutionUnit::~IRExecutionUnit() {
- m_module_ap.reset();
- m_execution_engine_ap.reset();
- m_context_ap.reset();
+ m_module_up.reset();
+ m_execution_engine_up.reset();
+ m_context_up.reset();
}
IRExecutionUnit::MemoryManager::MemoryManager(IRExecutionUnit &parent)
- : m_default_mm_ap(new llvm::SectionMemoryManager()), m_parent(parent) {}
+ : m_default_mm_up(new llvm::SectionMemoryManager()), m_parent(parent) {}
IRExecutionUnit::MemoryManager::~MemoryManager() {}
@@ -596,7 +596,7 @@
llvm::StringRef SectionName) {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
- uint8_t *return_value = m_default_mm_ap->allocateCodeSection(
+ uint8_t *return_value = m_default_mm_up->allocateCodeSection(
Size, Alignment, SectionID, SectionName);
m_parent.m_records.push_back(AllocationRecord(
@@ -627,7 +627,7 @@
llvm::StringRef SectionName, bool IsReadOnly) {
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_EXPRESSIONS));
- uint8_t *return_value = m_default_mm_ap->allocateDataSection(
+ uint8_t *return_value = m_default_mm_up->allocateDataSection(
Size, Alignment, SectionID, SectionName, IsReadOnly);
uint32_t permissions = lldb::ePermissionsReadable;