*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

lldb/source/DataFormatters/FormatCache.cpp

@@ -1,4 +1,5 @@
-//===-- FormatCache.cpp ------------------------------------------*- C++ -*-===//
+//===-- FormatCache.cpp ------------------------------------------*- C++
+//-*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -19,279 +20,205 @@
 using namespace lldb;
 using namespace lldb_private;
 
-FormatCache::Entry::Entry () :
-m_format_cached(false),
-m_summary_cached(false),
-m_synthetic_cached(false),
-m_validator_cached(false),
-m_format_sp(),
-m_summary_sp(),
-m_synthetic_sp(),
-m_validator_sp()
-{}
+FormatCache::Entry::Entry()
+    : m_format_cached(false), m_summary_cached(false),
+      m_synthetic_cached(false), m_validator_cached(false), m_format_sp(),
+      m_summary_sp(), m_synthetic_sp(), m_validator_sp() {}
 
-FormatCache::Entry::Entry (lldb::TypeFormatImplSP format_sp) :
-m_summary_cached(false),
-m_synthetic_cached(false),
-m_validator_cached(false),
-m_summary_sp(),
-m_synthetic_sp(),
-m_validator_sp()
-{
-    SetFormat (format_sp);
+FormatCache::Entry::Entry(lldb::TypeFormatImplSP format_sp)
+    : m_summary_cached(false), m_synthetic_cached(false),
+      m_validator_cached(false), m_summary_sp(), m_synthetic_sp(),
+      m_validator_sp() {
+  SetFormat(format_sp);
 }
 
-FormatCache::Entry::Entry (lldb::TypeSummaryImplSP summary_sp) :
-m_format_cached(false),
-m_synthetic_cached(false),
-m_validator_cached(false),
-m_format_sp(),
-m_synthetic_sp(),
-m_validator_sp()
-{
-    SetSummary (summary_sp);
+FormatCache::Entry::Entry(lldb::TypeSummaryImplSP summary_sp)
+    : m_format_cached(false), m_synthetic_cached(false),
+      m_validator_cached(false), m_format_sp(), m_synthetic_sp(),
+      m_validator_sp() {
+  SetSummary(summary_sp);
 }
 
-FormatCache::Entry::Entry (lldb::SyntheticChildrenSP synthetic_sp) :
-m_format_cached(false),
-m_summary_cached(false),
-m_validator_cached(false),
-m_format_sp(),
-m_summary_sp(),
-m_validator_sp()
-{
-    SetSynthetic (synthetic_sp);
+FormatCache::Entry::Entry(lldb::SyntheticChildrenSP synthetic_sp)
+    : m_format_cached(false), m_summary_cached(false),
+      m_validator_cached(false), m_format_sp(), m_summary_sp(),
+      m_validator_sp() {
+  SetSynthetic(synthetic_sp);
 }
 
-FormatCache::Entry::Entry (lldb::TypeValidatorImplSP validator_sp) :
-m_format_cached(false),
-m_summary_cached(false),
-m_synthetic_cached(false),
-m_format_sp(),
-m_summary_sp(),
-m_synthetic_sp()
-{
-    SetValidator (validator_sp);
+FormatCache::Entry::Entry(lldb::TypeValidatorImplSP validator_sp)
+    : m_format_cached(false), m_summary_cached(false),
+      m_synthetic_cached(false), m_format_sp(), m_summary_sp(),
+      m_synthetic_sp() {
+  SetValidator(validator_sp);
 }
 
-FormatCache::Entry::Entry (lldb::TypeFormatImplSP format_sp, lldb::TypeSummaryImplSP summary_sp, lldb::SyntheticChildrenSP synthetic_sp, lldb::TypeValidatorImplSP validator_sp)
-{
-    SetFormat (format_sp);
-    SetSummary (summary_sp);
-    SetSynthetic (synthetic_sp);
-    SetValidator (validator_sp);
+FormatCache::Entry::Entry(lldb::TypeFormatImplSP format_sp,
+                          lldb::TypeSummaryImplSP summary_sp,
+                          lldb::SyntheticChildrenSP synthetic_sp,
+                          lldb::TypeValidatorImplSP validator_sp) {
+  SetFormat(format_sp);
+  SetSummary(summary_sp);
+  SetSynthetic(synthetic_sp);
+  SetValidator(validator_sp);
 }
 
-bool
-FormatCache::Entry::IsFormatCached ()
-{
-    return m_format_cached;
+bool FormatCache::Entry::IsFormatCached() { return m_format_cached; }
+
+bool FormatCache::Entry::IsSummaryCached() { return m_summary_cached; }
+
+bool FormatCache::Entry::IsSyntheticCached() { return m_synthetic_cached; }
+
+bool FormatCache::Entry::IsValidatorCached() { return m_validator_cached; }
+
+lldb::TypeFormatImplSP FormatCache::Entry::GetFormat() { return m_format_sp; }
+
+lldb::TypeSummaryImplSP FormatCache::Entry::GetSummary() {
+  return m_summary_sp;
 }
 
-bool
-FormatCache::Entry::IsSummaryCached ()
-{
-    return m_summary_cached;
+lldb::SyntheticChildrenSP FormatCache::Entry::GetSynthetic() {
+  return m_synthetic_sp;
 }
 
-bool
-FormatCache::Entry::IsSyntheticCached ()
-{
-    return m_synthetic_cached;
+lldb::TypeValidatorImplSP FormatCache::Entry::GetValidator() {
+  return m_validator_sp;
 }
 
-bool
-FormatCache::Entry::IsValidatorCached ()
-{
-    return m_validator_cached;
+void FormatCache::Entry::SetFormat(lldb::TypeFormatImplSP format_sp) {
+  m_format_cached = true;
+  m_format_sp = format_sp;
 }
 
-lldb::TypeFormatImplSP
-FormatCache::Entry::GetFormat ()
-{
-    return m_format_sp;
+void FormatCache::Entry::SetSummary(lldb::TypeSummaryImplSP summary_sp) {
+  m_summary_cached = true;
+  m_summary_sp = summary_sp;
 }
 
-lldb::TypeSummaryImplSP
-FormatCache::Entry::GetSummary ()
-{
-    return m_summary_sp;
+void FormatCache::Entry::SetSynthetic(lldb::SyntheticChildrenSP synthetic_sp) {
+  m_synthetic_cached = true;
+  m_synthetic_sp = synthetic_sp;
 }
 
-lldb::SyntheticChildrenSP
-FormatCache::Entry::GetSynthetic ()
-{
-    return m_synthetic_sp;
-}
-
-lldb::TypeValidatorImplSP
-FormatCache::Entry::GetValidator ()
-{
-    return m_validator_sp;
-}
-
-void
-FormatCache::Entry::SetFormat (lldb::TypeFormatImplSP format_sp)
-{
-    m_format_cached = true;
-    m_format_sp = format_sp;
-}
-
-void
-FormatCache::Entry::SetSummary (lldb::TypeSummaryImplSP summary_sp)
-{
-    m_summary_cached = true;
-    m_summary_sp = summary_sp;
-}
-
-void
-FormatCache::Entry::SetSynthetic (lldb::SyntheticChildrenSP synthetic_sp)
-{
-    m_synthetic_cached = true;
-    m_synthetic_sp = synthetic_sp;
-}
-
-void
-FormatCache::Entry::SetValidator (lldb::TypeValidatorImplSP validator_sp)
-{
-    m_validator_cached = true;
-    m_validator_sp = validator_sp;
+void FormatCache::Entry::SetValidator(lldb::TypeValidatorImplSP validator_sp) {
+  m_validator_cached = true;
+  m_validator_sp = validator_sp;
 }
 
 FormatCache::FormatCache()
-    : m_map(),
-      m_mutex()
+    : m_map(), m_mutex()
 #ifdef LLDB_CONFIGURATION_DEBUG
       ,
-      m_cache_hits(0),
-      m_cache_misses(0)
+      m_cache_hits(0), m_cache_misses(0)
 #endif
 {
 }
 
-FormatCache::Entry&
-FormatCache::GetEntry (const ConstString& type)
-{
-    auto i = m_map.find(type),
-    e = m_map.end();
-    if (i != e)
-        return i->second;
-    m_map[type] = FormatCache::Entry();
-    return m_map[type];
+FormatCache::Entry &FormatCache::GetEntry(const ConstString &type) {
+  auto i = m_map.find(type), e = m_map.end();
+  if (i != e)
+    return i->second;
+  m_map[type] = FormatCache::Entry();
+  return m_map[type];
 }
 
-bool
-FormatCache::GetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    auto entry = GetEntry(type);
-    if (entry.IsFormatCached())
-    {
+bool FormatCache::GetFormat(const ConstString &type,
+                            lldb::TypeFormatImplSP &format_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  auto entry = GetEntry(type);
+  if (entry.IsFormatCached()) {
 #ifdef LLDB_CONFIGURATION_DEBUG
-        m_cache_hits++;
+    m_cache_hits++;
 #endif
-        format_sp = entry.GetFormat();
-        return true;
-    }
+    format_sp = entry.GetFormat();
+    return true;
+  }
 #ifdef LLDB_CONFIGURATION_DEBUG
-    m_cache_misses++;
+  m_cache_misses++;
 #endif
-    format_sp.reset();
-    return false;
+  format_sp.reset();
+  return false;
 }
 
-bool
-FormatCache::GetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    auto entry = GetEntry(type);
-    if (entry.IsSummaryCached())
-    {
+bool FormatCache::GetSummary(const ConstString &type,
+                             lldb::TypeSummaryImplSP &summary_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  auto entry = GetEntry(type);
+  if (entry.IsSummaryCached()) {
 #ifdef LLDB_CONFIGURATION_DEBUG
-        m_cache_hits++;
+    m_cache_hits++;
 #endif
-        summary_sp = entry.GetSummary();
-        return true;
-    }
+    summary_sp = entry.GetSummary();
+    return true;
+  }
 #ifdef LLDB_CONFIGURATION_DEBUG
-    m_cache_misses++;
+  m_cache_misses++;
 #endif
-    summary_sp.reset();
-    return false;
+  summary_sp.reset();
+  return false;
 }
 
-bool
-FormatCache::GetSynthetic (const ConstString& type,lldb::SyntheticChildrenSP& synthetic_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    auto entry = GetEntry(type);
-    if (entry.IsSyntheticCached())
-    {
+bool FormatCache::GetSynthetic(const ConstString &type,
+                               lldb::SyntheticChildrenSP &synthetic_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  auto entry = GetEntry(type);
+  if (entry.IsSyntheticCached()) {
 #ifdef LLDB_CONFIGURATION_DEBUG
-        m_cache_hits++;
+    m_cache_hits++;
 #endif
-        synthetic_sp = entry.GetSynthetic();
-        return true;
-    }
+    synthetic_sp = entry.GetSynthetic();
+    return true;
+  }
 #ifdef LLDB_CONFIGURATION_DEBUG
-    m_cache_misses++;
+  m_cache_misses++;
 #endif
-    synthetic_sp.reset();
-    return false;
+  synthetic_sp.reset();
+  return false;
 }
 
-bool
-FormatCache::GetValidator (const ConstString& type,lldb::TypeValidatorImplSP& validator_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    auto entry = GetEntry(type);
-    if (entry.IsValidatorCached())
-    {
+bool FormatCache::GetValidator(const ConstString &type,
+                               lldb::TypeValidatorImplSP &validator_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  auto entry = GetEntry(type);
+  if (entry.IsValidatorCached()) {
 #ifdef LLDB_CONFIGURATION_DEBUG
-        m_cache_hits++;
+    m_cache_hits++;
 #endif
-        validator_sp = entry.GetValidator();
-        return true;
-    }
+    validator_sp = entry.GetValidator();
+    return true;
+  }
 #ifdef LLDB_CONFIGURATION_DEBUG
-    m_cache_misses++;
+  m_cache_misses++;
 #endif
-    validator_sp.reset();
-    return false;
+  validator_sp.reset();
+  return false;
 }
 
-void
-FormatCache::SetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    GetEntry(type).SetFormat(format_sp);
+void FormatCache::SetFormat(const ConstString &type,
+                            lldb::TypeFormatImplSP &format_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  GetEntry(type).SetFormat(format_sp);
 }
 
-void
-FormatCache::SetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    GetEntry(type).SetSummary(summary_sp);
+void FormatCache::SetSummary(const ConstString &type,
+                             lldb::TypeSummaryImplSP &summary_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  GetEntry(type).SetSummary(summary_sp);
 }
 
-void
-FormatCache::SetSynthetic (const ConstString& type,lldb::SyntheticChildrenSP& synthetic_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    GetEntry(type).SetSynthetic(synthetic_sp);
+void FormatCache::SetSynthetic(const ConstString &type,
+                               lldb::SyntheticChildrenSP &synthetic_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  GetEntry(type).SetSynthetic(synthetic_sp);
 }
 
-void
-FormatCache::SetValidator (const ConstString& type,lldb::TypeValidatorImplSP& validator_sp)
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    GetEntry(type).SetValidator(validator_sp);
+void FormatCache::SetValidator(const ConstString &type,
+                               lldb::TypeValidatorImplSP &validator_sp) {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  GetEntry(type).SetValidator(validator_sp);
 }
 
-void
-FormatCache::Clear ()
-{
-    std::lock_guard<std::recursive_mutex> guard(m_mutex);
-    m_map.clear();
+void FormatCache::Clear() {
+  std::lock_guard<std::recursive_mutex> guard(m_mutex);
+  m_map.clear();
 }
-