*** 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

1 files changed, 140 insertions, 134 deletions

diff --git a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
index c57c4ac..c6f629d 100644
--- a/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
+++ b/lldb/tools/lldb-mi/MICmdCmdGdbInfo.cpp
@@ -10,22 +10,24 @@
 // Overview:    CMICmdCmdGdbInfo        implementation.
 
 // Third party headers:
-#include <inttypes.h> // For PRIx64
 #include "lldb/API/SBCommandReturnObject.h"
+#include <inttypes.h> // For PRIx64
 
 // In-house headers:
+#include "MICmdArgValString.h"
 #include "MICmdCmdGdbInfo.h"
+#include "MICmnLLDBDebugSessionInfo.h"
 #include "MICmnMIResultRecord.h"
 #include "MICmnMIValueConst.h"
-#include "MICmdArgValString.h"
 #include "MICmnStreamStdout.h"
-#include "MICmnLLDBDebugSessionInfo.h"
 
 // Instantiations:
-const CMICmdCmdGdbInfo::MapPrintFnNameToPrintFn_t CMICmdCmdGdbInfo::ms_mapPrintFnNameToPrintFn = {
-    {"sharedlibrary", &CMICmdCmdGdbInfo::PrintFnSharedLibrary}};
+const CMICmdCmdGdbInfo::MapPrintFnNameToPrintFn_t
+    CMICmdCmdGdbInfo::ms_mapPrintFnNameToPrintFn = {
+        {"sharedlibrary", &CMICmdCmdGdbInfo::PrintFnSharedLibrary}};
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbInfo constructor.
 // Type:    Method.
 // Args:    None.
@@ -33,31 +35,30 @@ const CMICmdCmdGdbInfo::MapPrintFnNameToPrintFn_t CMICmdCmdGdbInfo::ms_mapPrintF
 // Throws:  None.
 //--
 CMICmdCmdGdbInfo::CMICmdCmdGdbInfo()
-    : m_constStrArgNamedPrint("print")
-    , m_bPrintFnRecognised(true)
-    , m_bPrintFnSuccessful(false)
-    , m_strPrintFnError(MIRSRC(IDS_WORD_ERR_MSG_NOT_IMPLEMENTED_BRKTS))
-{
-    // Command factory matches this name with that received from the stdin stream
-    m_strMiCmd = "info";
-
-    // Required by the CMICmdFactory when registering *this command
-    m_pSelfCreatorFn = &CMICmdCmdGdbInfo::CreateSelf;
+    : m_constStrArgNamedPrint("print"), m_bPrintFnRecognised(true),
+      m_bPrintFnSuccessful(false),
+      m_strPrintFnError(MIRSRC(IDS_WORD_ERR_MSG_NOT_IMPLEMENTED_BRKTS)) {
+  // Command factory matches this name with that received from the stdin stream
+  m_strMiCmd = "info";
+
+  // Required by the CMICmdFactory when registering *this command
+  m_pSelfCreatorFn = &CMICmdCmdGdbInfo::CreateSelf;
 }
 
-//++ ------------------------------------------------------------------------------------
+//++
+//------------------------------------------------------------------------------------
 // Details: CMICmdCmdGdbInfo destructor.
 // Type:    Overrideable.
 // Args:    None.
 // Return:  None.
 // Throws:  None.
 //--
-CMICmdCmdGdbInfo::~CMICmdCmdGdbInfo()
-{
-}
+CMICmdCmdGdbInfo::~CMICmdCmdGdbInfo() {}
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The parses the command line options
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The parses the command line
+// options
 //          arguments to extract values for each of those arguments.
 // Type:    Overridden.
 // Args:    None.
@@ -65,43 +66,43 @@ CMICmdCmdGdbInfo::~CMICmdCmdGdbInfo()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbInfo::ParseArgs()
-{
-    m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedPrint, true, true));
-    return ParseValidateCmdOptions();
+bool CMICmdCmdGdbInfo::ParseArgs() {
+  m_setCmdArgs.Add(new CMICmdArgValString(m_constStrArgNamedPrint, true, true));
+  return ParseValidateCmdOptions();
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command does work in this function.
-//          The command is likely to communicate with the LLDB SBDebugger in here.
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command does work in this
+// function.
+//          The command is likely to communicate with the LLDB SBDebugger in
+//          here.
 // Type:    Overridden.
 // Args:    None.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbInfo::Execute()
-{
-    CMICMDBASE_GETOPTION(pArgPrint, String, m_constStrArgNamedPrint);
-    const CMIUtilString &rPrintRequest(pArgPrint->GetValue());
-
-    FnPrintPtr pPrintRequestFn = nullptr;
-    if (!GetPrintFn(rPrintRequest, pPrintRequestFn))
-    {
-        m_strPrintFnName = rPrintRequest;
-        m_bPrintFnRecognised = false;
-        return MIstatus::success;
-    }
+bool CMICmdCmdGdbInfo::Execute() {
+  CMICMDBASE_GETOPTION(pArgPrint, String, m_constStrArgNamedPrint);
+  const CMIUtilString &rPrintRequest(pArgPrint->GetValue());
+
+  FnPrintPtr pPrintRequestFn = nullptr;
+  if (!GetPrintFn(rPrintRequest, pPrintRequestFn)) {
+    m_strPrintFnName = rPrintRequest;
+    m_bPrintFnRecognised = false;
+    return MIstatus::success;
+  }
 
-    m_bPrintFnSuccessful = (this->*(pPrintRequestFn))();
+  m_bPrintFnSuccessful = (this->*(pPrintRequestFn))();
 
-    return MIstatus::success;
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: The invoker requires this function. The command prepares a MI Record Result
+//++
+//------------------------------------------------------------------------------------
+// Details: The invoker requires this function. The command prepares a MI Record
+// Result
 //          for the work carried out in the Execute().
 // Type:    Overridden.
 // Args:    None.
@@ -109,72 +110,77 @@ CMICmdCmdGdbInfo::Execute()
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbInfo::Acknowledge()
-{
-    if (!m_bPrintFnRecognised)
-    {
-        const CMICmnMIValueConst miValueConst(CMIUtilString::Format(MIRSRC(IDS_CMD_ERR_INFO_PRINTFN_NOT_FOUND), m_strPrintFnName.c_str()));
-        const CMICmnMIValueResult miValueResult("msg", miValueConst);
-        const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error, miValueResult);
-        m_miResultRecord = miRecordResult;
-        return MIstatus::success;
-    }
-
-    if (m_bPrintFnSuccessful)
-    {
-        const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done);
-        m_miResultRecord = miRecordResult;
-        return MIstatus::success;
-    }
-
-    const CMICmnMIValueConst miValueConst(CMIUtilString::Format(MIRSRC(IDS_CMD_ERR_INFO_PRINTFN_FAILED), m_strPrintFnError.c_str()));
+bool CMICmdCmdGdbInfo::Acknowledge() {
+  if (!m_bPrintFnRecognised) {
+    const CMICmnMIValueConst miValueConst(CMIUtilString::Format(
+        MIRSRC(IDS_CMD_ERR_INFO_PRINTFN_NOT_FOUND), m_strPrintFnName.c_str()));
     const CMICmnMIValueResult miValueResult("msg", miValueConst);
-    const CMICmnMIResultRecord miRecordResult(m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error, miValueResult);
+    const CMICmnMIResultRecord miRecordResult(
+        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error,
+        miValueResult);
     m_miResultRecord = miRecordResult;
+    return MIstatus::success;
+  }
 
+  if (m_bPrintFnSuccessful) {
+    const CMICmnMIResultRecord miRecordResult(
+        m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Done);
+    m_miResultRecord = miRecordResult;
     return MIstatus::success;
+  }
+
+  const CMICmnMIValueConst miValueConst(CMIUtilString::Format(
+      MIRSRC(IDS_CMD_ERR_INFO_PRINTFN_FAILED), m_strPrintFnError.c_str()));
+  const CMICmnMIValueResult miValueResult("msg", miValueConst);
+  const CMICmnMIResultRecord miRecordResult(
+      m_cmdData.strMiCmdToken, CMICmnMIResultRecord::eResultClass_Error,
+      miValueResult);
+  m_miResultRecord = miRecordResult;
+
+  return MIstatus::success;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Required by the CMICmdFactory when registering *this command. The factory
+//++
+//------------------------------------------------------------------------------------
+// Details: Required by the CMICmdFactory when registering *this command. The
+// factory
 //          calls this function to create an instance of *this command.
 // Type:    Static method.
 // Args:    None.
 // Return:  CMICmdBase * - Pointer to a new command.
 // Throws:  None.
 //--
-CMICmdBase *
-CMICmdCmdGdbInfo::CreateSelf()
-{
-    return new CMICmdCmdGdbInfo();
-}
+CMICmdBase *CMICmdCmdGdbInfo::CreateSelf() { return new CMICmdCmdGdbInfo(); }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Retrieve the print function's pointer for the matching print request.
+//++
+//------------------------------------------------------------------------------------
+// Details: Retrieve the print function's pointer for the matching print
+// request.
 // Type:    Method.
 // Args:    vrPrintFnName   - (R) The info requested.
-//          vrwpFn          - (W) The print function's pointer of the function to carry out
+//          vrwpFn          - (W) The print function's pointer of the function
+//          to carry out
 // Return:  bool    - True = Print request is implemented, false = not found.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbInfo::GetPrintFn(const CMIUtilString &vrPrintFnName, FnPrintPtr &vrwpFn) const
-{
-    vrwpFn = nullptr;
-
-    const MapPrintFnNameToPrintFn_t::const_iterator it = ms_mapPrintFnNameToPrintFn.find(vrPrintFnName);
-    if (it != ms_mapPrintFnNameToPrintFn.end())
-    {
-        vrwpFn = (*it).second;
-        return true;
-    }
-
-    return false;
+bool CMICmdCmdGdbInfo::GetPrintFn(const CMIUtilString &vrPrintFnName,
+                                  FnPrintPtr &vrwpFn) const {
+  vrwpFn = nullptr;
+
+  const MapPrintFnNameToPrintFn_t::const_iterator it =
+      ms_mapPrintFnNameToPrintFn.find(vrPrintFnName);
+  if (it != ms_mapPrintFnNameToPrintFn.end()) {
+    vrwpFn = (*it).second;
+    return true;
+  }
+
+  return false;
 }
 
-//++ ------------------------------------------------------------------------------------
-// Details: Carry out work to complete the request to prepare and send back information
+//++
+//------------------------------------------------------------------------------------
+// Details: Carry out work to complete the request to prepare and send back
+// information
 //          asked for.
 // Type:    Method.
 // Args:    None.
@@ -182,48 +188,48 @@ CMICmdCmdGdbInfo::GetPrintFn(const CMIUtilString &vrPrintFnName, FnPrintPtr &vrw
 //          MIstatus::failure - Functional failed.
 // Throws:  None.
 //--
-bool
-CMICmdCmdGdbInfo::PrintFnSharedLibrary()
-{
-    CMICmnStreamStdout &rStdout = CMICmnStreamStdout::Instance();
-    bool bOk = rStdout.TextToStdout("~\"From        To          Syms Read   Shared Object Library\"");
-
-    CMICmnLLDBDebugSessionInfo &rSessionInfo(CMICmnLLDBDebugSessionInfo::Instance());
-    lldb::SBTarget sbTarget = rSessionInfo.GetTarget();
-    const MIuint nModules = sbTarget.GetNumModules();
-    for (MIuint i = 0; bOk && (i < nModules); i++)
-    {
-        lldb::SBModule module = sbTarget.GetModuleAtIndex(i);
-        if (module.IsValid())
-        {
-            const CMIUtilString strModuleFilePath(module.GetFileSpec().GetDirectory());
-            const CMIUtilString strModuleFileName(module.GetFileSpec().GetFilename());
-            const CMIUtilString strModuleFullPath(CMIUtilString::Format("%s/%s", strModuleFilePath.c_str(), strModuleFileName.c_str()));
-            const CMIUtilString strHasSymbols = (module.GetNumSymbols() > 0) ? "Yes" : "No";
-            lldb::addr_t addrLoadS = 0xffffffffffffffff;
-            lldb::addr_t addrLoadSize = 0;
-            bool bHaveAddrLoad = false;
-            const MIuint nSections = module.GetNumSections();
-            for (MIuint j = 0; j < nSections; j++)
-            {
-                lldb::SBSection section = module.GetSectionAtIndex(j);
-                lldb::addr_t addrLoad = section.GetLoadAddress(sbTarget);
-                if (addrLoad != (lldb::addr_t) - 1)
-                {
-                    if (!bHaveAddrLoad)
-                    {
-                        bHaveAddrLoad = true;
-                        addrLoadS = addrLoad;
-                    }
-
-                    addrLoadSize += section.GetByteSize();
-                }
-            }
-            bOk = bOk &&
-                  rStdout.TextToStdout(CMIUtilString::Format("~\"0x%016" PRIx64 "\t0x%016" PRIx64 "\t%s\t\t%s\"", addrLoadS, addrLoadS + addrLoadSize,
-                                                             strHasSymbols.c_str(), strModuleFullPath.c_str()));
+bool CMICmdCmdGdbInfo::PrintFnSharedLibrary() {
+  CMICmnStreamStdout &rStdout = CMICmnStreamStdout::Instance();
+  bool bOk = rStdout.TextToStdout(
+      "~\"From        To          Syms Read   Shared Object Library\"");
+
+  CMICmnLLDBDebugSessionInfo &rSessionInfo(
+      CMICmnLLDBDebugSessionInfo::Instance());
+  lldb::SBTarget sbTarget = rSessionInfo.GetTarget();
+  const MIuint nModules = sbTarget.GetNumModules();
+  for (MIuint i = 0; bOk && (i < nModules); i++) {
+    lldb::SBModule module = sbTarget.GetModuleAtIndex(i);
+    if (module.IsValid()) {
+      const CMIUtilString strModuleFilePath(
+          module.GetFileSpec().GetDirectory());
+      const CMIUtilString strModuleFileName(module.GetFileSpec().GetFilename());
+      const CMIUtilString strModuleFullPath(CMIUtilString::Format(
+          "%s/%s", strModuleFilePath.c_str(), strModuleFileName.c_str()));
+      const CMIUtilString strHasSymbols =
+          (module.GetNumSymbols() > 0) ? "Yes" : "No";
+      lldb::addr_t addrLoadS = 0xffffffffffffffff;
+      lldb::addr_t addrLoadSize = 0;
+      bool bHaveAddrLoad = false;
+      const MIuint nSections = module.GetNumSections();
+      for (MIuint j = 0; j < nSections; j++) {
+        lldb::SBSection section = module.GetSectionAtIndex(j);
+        lldb::addr_t addrLoad = section.GetLoadAddress(sbTarget);
+        if (addrLoad != (lldb::addr_t)-1) {
+          if (!bHaveAddrLoad) {
+            bHaveAddrLoad = true;
+            addrLoadS = addrLoad;
+          }
+
+          addrLoadSize += section.GetByteSize();
         }
+      }
+      bOk = bOk &&
+            rStdout.TextToStdout(CMIUtilString::Format(
+                "~\"0x%016" PRIx64 "\t0x%016" PRIx64 "\t%s\t\t%s\"", addrLoadS,
+                addrLoadS + addrLoadSize, strHasSymbols.c_str(),
+                strModuleFullPath.c_str()));
     }
+  }
 
-    return bOk;
+  return bOk;
 }