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

3 files changed, 32 insertions, 32 deletions

diff --git a/lldb/tools/lldb-perf/lib/Gauge.cpp b/lldb/tools/lldb-perf/lib/Gauge.cpp
index bbde3d8f868..42c7934bca5 100644
--- a/lldb/tools/lldb-perf/lib/Gauge.cpp
+++ b/lldb/tools/lldb-perf/lib/Gauge.cpp
@@ -13,11 +13,11 @@ template <>
 lldb_perf::Results::ResultSP lldb_perf::GetResult(const char *description,
                                                   double value) {
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddDouble("value", NULL, value);
-    return Results::ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddDouble("value", NULL, value);
+    return Results::ResultSP(value_dict_up.release());
   }
   return Results::ResultSP(new Results::Double(NULL, NULL, value));
 }
@@ -26,11 +26,11 @@ template <>
 lldb_perf::Results::ResultSP lldb_perf::GetResult(const char *description,
                                                   uint64_t value) {
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddUnsigned("value", NULL, value);
-    return Results::ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddUnsigned("value", NULL, value);
+    return Results::ResultSP(value_dict_up.release());
   }
   return Results::ResultSP(new Results::Unsigned(NULL, NULL, value));
 }
@@ -39,11 +39,11 @@ template <>
 lldb_perf::Results::ResultSP lldb_perf::GetResult(const char *description,
                                                   std::string value) {
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddString("value", NULL, value.c_str());
-    return Results::ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddString("value", NULL, value.c_str());
+    return Results::ResultSP(value_dict_up.release());
   }
   return Results::ResultSP(new Results::String(NULL, NULL, value.c_str()));
 }
diff --git a/lldb/tools/lldb-perf/lib/MemoryGauge.cpp b/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
index 13d0aca42d9..432c93d1c0c 100644
--- a/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
+++ b/lldb/tools/lldb-perf/lib/MemoryGauge.cpp
@@ -70,11 +70,11 @@ MemoryStats MemoryStats::operator*(const MemoryStats &rhs) {
 
 Results::ResultSP MemoryStats::GetResult(const char *name,
                                          const char *description) const {
-  std::unique_ptr<Results::Dictionary> dict_ap(
+  std::unique_ptr<Results::Dictionary> dict_up(
       new Results::Dictionary(name, NULL));
-  dict_ap->AddUnsigned("resident", NULL, GetResidentSize());
-  dict_ap->AddUnsigned("max_resident", NULL, GetMaxResidentSize());
-  return Results::ResultSP(dict_ap.release());
+  dict_up->AddUnsigned("resident", NULL, GetResidentSize());
+  dict_up->AddUnsigned("max_resident", NULL, GetMaxResidentSize());
+  return Results::ResultSP(dict_up.release());
 }
 
 MemoryGauge::ValueType MemoryGauge::Now() {
diff --git a/lldb/tools/lldb-perf/lib/Results.cpp b/lldb/tools/lldb-perf/lib/Results.cpp
index 378db9b185d..16df5c42155 100644
--- a/lldb/tools/lldb-perf/lib/Results.cpp
+++ b/lldb/tools/lldb-perf/lib/Results.cpp
@@ -153,11 +153,11 @@ Results::ResultSP Results::Dictionary::AddUnsigned(const char *name,
                                                    uint64_t value) {
   assert(name && name[0]);
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddUnsigned("value", NULL, value);
-    m_dictionary[std::string(name)] = ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddUnsigned("value", NULL, value);
+    m_dictionary[std::string(name)] = ResultSP(value_dict_up.release());
   } else
     m_dictionary[std::string(name)] =
         ResultSP(new Unsigned(name, description, value));
@@ -170,11 +170,11 @@ Results::ResultSP Results::Dictionary::AddDouble(const char *name,
   assert(name && name[0]);
 
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddDouble("value", NULL, value);
-    m_dictionary[std::string(name)] = ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddDouble("value", NULL, value);
+    m_dictionary[std::string(name)] = ResultSP(value_dict_up.release());
   } else
     m_dictionary[std::string(name)] =
         ResultSP(new Double(name, description, value));
@@ -185,11 +185,11 @@ Results::ResultSP Results::Dictionary::AddString(const char *name,
                                                  const char *value) {
   assert(name && name[0]);
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->AddString("value", NULL, value);
-    m_dictionary[std::string(name)] = ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->AddString("value", NULL, value);
+    m_dictionary[std::string(name)] = ResultSP(value_dict_up.release());
   } else
     m_dictionary[std::string(name)] =
         ResultSP(new String(name, description, value));
@@ -201,11 +201,11 @@ Results::ResultSP Results::Dictionary::Add(const char *name,
                                            const ResultSP &result_sp) {
   assert(name && name[0]);
   if (description && description[0]) {
-    std::unique_ptr<Results::Dictionary> value_dict_ap(
+    std::unique_ptr<Results::Dictionary> value_dict_up(
         new Results::Dictionary());
-    value_dict_ap->AddString("description", NULL, description);
-    value_dict_ap->Add("value", NULL, result_sp);
-    m_dictionary[std::string(name)] = ResultSP(value_dict_ap.release());
+    value_dict_up->AddString("description", NULL, description);
+    value_dict_up->Add("value", NULL, result_sp);
+    m_dictionary[std::string(name)] = ResultSP(value_dict_up.release());
   } else
     m_dictionary[std::string(name)] = result_sp;
   return m_dictionary[std::string(name)];