caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace 'ap' with 'up' suffix in variable names. (NFC)

Browse Source 
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
This commit is contained in:
Jonas Devlieghere
2019-02-13 06:25:41 +00:00
parent 5cf777e413
commit d5b440369d
190 changed files with 1963 additions and 1959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
lldb/source/API/SBModuleSpec.cpp
View File

@@ -17,58 +17,58 @@
using namespace lldb;
using namespace lldb_private;
SBModuleSpec::SBModuleSpec() : m_opaque_ap(new lldb_private::ModuleSpec()) {}
SBModuleSpec::SBModuleSpec() : m_opaque_up(new lldb_private::ModuleSpec()) {}
SBModuleSpec::SBModuleSpec(const SBModuleSpec &rhs)
: m_opaque_ap(new lldb_private::ModuleSpec(*rhs.m_opaque_ap)) {}
: m_opaque_up(new lldb_private::ModuleSpec(*rhs.m_opaque_up)) {}
const SBModuleSpec &SBModuleSpec::operator=(const SBModuleSpec &rhs) {
if (this != &rhs)
*m_opaque_ap = *(rhs.m_opaque_ap);
*m_opaque_up = *(rhs.m_opaque_up);
return *this;
}
SBModuleSpec::~SBModuleSpec() {}
bool SBModuleSpec::IsValid() const { return m_opaque_ap->operator bool(); }
bool SBModuleSpec::IsValid() const { return m_opaque_up->operator bool(); }
void SBModuleSpec::Clear() { m_opaque_ap->Clear(); }
void SBModuleSpec::Clear() { m_opaque_up->Clear(); }
SBFileSpec SBModuleSpec::GetFileSpec() {
SBFileSpec sb_spec(m_opaque_ap->GetFileSpec());
SBFileSpec sb_spec(m_opaque_up->GetFileSpec());
return sb_spec;
}
void SBModuleSpec::SetFileSpec(const lldb::SBFileSpec &sb_spec) {
m_opaque_ap->GetFileSpec() = *sb_spec;
m_opaque_up->GetFileSpec() = *sb_spec;
}
lldb::SBFileSpec SBModuleSpec::GetPlatformFileSpec() {
return SBFileSpec(m_opaque_ap->GetPlatformFileSpec());
return SBFileSpec(m_opaque_up->GetPlatformFileSpec());
}
void SBModuleSpec::SetPlatformFileSpec(const lldb::SBFileSpec &sb_spec) {
m_opaque_ap->GetPlatformFileSpec() = *sb_spec;
m_opaque_up->GetPlatformFileSpec() = *sb_spec;
}
lldb::SBFileSpec SBModuleSpec::GetSymbolFileSpec() {
return SBFileSpec(m_opaque_ap->GetSymbolFileSpec());
return SBFileSpec(m_opaque_up->GetSymbolFileSpec());
}
void SBModuleSpec::SetSymbolFileSpec(const lldb::SBFileSpec &sb_spec) {
m_opaque_ap->GetSymbolFileSpec() = *sb_spec;
m_opaque_up->GetSymbolFileSpec() = *sb_spec;
}
const char *SBModuleSpec::GetObjectName() {
return m_opaque_ap->GetObjectName().GetCString();
return m_opaque_up->GetObjectName().GetCString();
}
void SBModuleSpec::SetObjectName(const char *name) {
m_opaque_ap->GetObjectName().SetCString(name);
m_opaque_up->GetObjectName().SetCString(name);
}
const char *SBModuleSpec::GetTriple() {
std::string triple(m_opaque_ap->GetArchitecture().GetTriple().str());
std::string triple(m_opaque_up->GetArchitecture().GetTriple().str());
// Unique the string so we don't run into ownership issues since the const
// strings put the string into the string pool once and the strings never
// comes out
@@ -77,35 +77,35 @@ const char *SBModuleSpec::GetTriple() {
}
void SBModuleSpec::SetTriple(const char *triple) {
m_opaque_ap->GetArchitecture().SetTriple(triple);
m_opaque_up->GetArchitecture().SetTriple(triple);
}
const uint8_t *SBModuleSpec::GetUUIDBytes() {
return m_opaque_ap->GetUUID().GetBytes().data();
return m_opaque_up->GetUUID().GetBytes().data();
}
size_t SBModuleSpec::GetUUIDLength() {
return m_opaque_ap->GetUUID().GetBytes().size();
return m_opaque_up->GetUUID().GetBytes().size();
}
bool SBModuleSpec::SetUUIDBytes(const uint8_t *uuid, size_t uuid_len) {
m_opaque_ap->GetUUID() = UUID::fromOptionalData(uuid, uuid_len);
return m_opaque_ap->GetUUID().IsValid();
m_opaque_up->GetUUID() = UUID::fromOptionalData(uuid, uuid_len);
return m_opaque_up->GetUUID().IsValid();
}
bool SBModuleSpec::GetDescription(lldb::SBStream &description) {
m_opaque_ap->Dump(description.ref());
m_opaque_up->Dump(description.ref());
return true;
}
SBModuleSpecList::SBModuleSpecList() : m_opaque_ap(new ModuleSpecList()) {}
SBModuleSpecList::SBModuleSpecList() : m_opaque_up(new ModuleSpecList()) {}
SBModuleSpecList::SBModuleSpecList(const SBModuleSpecList &rhs)
: m_opaque_ap(new ModuleSpecList(*rhs.m_opaque_ap)) {}
: m_opaque_up(new ModuleSpecList(*rhs.m_opaque_up)) {}
SBModuleSpecList &SBModuleSpecList::operator=(const SBModuleSpecList &rhs) {
if (this != &rhs)
*m_opaque_ap = *rhs.m_opaque_ap;
*m_opaque_up = *rhs.m_opaque_up;
return *this;
}
@@ -116,43 +116,43 @@ SBModuleSpecList SBModuleSpecList::GetModuleSpecifications(const char *path) {
FileSpec file_spec(path);
FileSystem::Instance().Resolve(file_spec);
Host::ResolveExecutableInBundle(file_spec);
ObjectFile::GetModuleSpecifications(file_spec, 0, 0, *specs.m_opaque_ap);
ObjectFile::GetModuleSpecifications(file_spec, 0, 0, *specs.m_opaque_up);
return specs;
}
void SBModuleSpecList::Append(const SBModuleSpec &spec) {
m_opaque_ap->Append(*spec.m_opaque_ap);
m_opaque_up->Append(*spec.m_opaque_up);
}
void SBModuleSpecList::Append(const SBModuleSpecList &spec_list) {
m_opaque_ap->Append(*spec_list.m_opaque_ap);
m_opaque_up->Append(*spec_list.m_opaque_up);
}
size_t SBModuleSpecList::GetSize() { return m_opaque_ap->GetSize(); }
size_t SBModuleSpecList::GetSize() { return m_opaque_up->GetSize(); }
SBModuleSpec SBModuleSpecList::GetSpecAtIndex(size_t i) {
SBModuleSpec sb_module_spec;
m_opaque_ap->GetModuleSpecAtIndex(i, *sb_module_spec.m_opaque_ap);
m_opaque_up->GetModuleSpecAtIndex(i, *sb_module_spec.m_opaque_up);
return sb_module_spec;
}
SBModuleSpec
SBModuleSpecList::FindFirstMatchingSpec(const SBModuleSpec &match_spec) {
SBModuleSpec sb_module_spec;
m_opaque_ap->FindMatchingModuleSpec(*match_spec.m_opaque_ap,
*sb_module_spec.m_opaque_ap);
m_opaque_up->FindMatchingModuleSpec(*match_spec.m_opaque_up,
*sb_module_spec.m_opaque_up);
return sb_module_spec;
}
SBModuleSpecList
SBModuleSpecList::FindMatchingSpecs(const SBModuleSpec &match_spec) {
SBModuleSpecList specs;
m_opaque_ap->FindMatchingModuleSpecs(*match_spec.m_opaque_ap,
*specs.m_opaque_ap);
m_opaque_up->FindMatchingModuleSpecs(*match_spec.m_opaque_up,
*specs.m_opaque_up);
return specs;
}
bool SBModuleSpecList::GetDescription(lldb::SBStream &description) {
m_opaque_ap->Dump(description.ref());
m_opaque_up->Dump(description.ref());
return true;
}