Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release:

MFC r309142 (by emaste):

Add WITH_LLD_AS_LD build knob

If set it installs LLD as /usr/bin/ld.  LLD (as of version 3.9) is not
capable of linking the world and kernel, but can self-host and link many
substantial applications. GNU ld continues to be used for the world and
kernel build, regardless of how this knob is set.

It is on by default for arm64, and off for all other CPU architectures.

Sponsored by:	The FreeBSD Foundation

MFC r310840:

Reapply 310775, now it also builds correctly if lldb is disabled:

Move llvm-objdump from CLANG_EXTRAS to installed by default

We currently install three tools from binutils 2.17.50: as, ld, and
objdump. Work is underway to migrate to a permissively-licensed
tool-chain, with one goal being the retirement of binutils 2.17.50.

LLVM's llvm-objdump is intended to be compatible with GNU objdump
although it is currently missing some options and may have formatting
differences. Enable it by default for testing and further investigation.
It may later be changed to install as /usr/bin/objdump, it becomes a
fully viable replacement.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D8879

MFC r312855 (by emaste):

Rename LLD_AS_LD to LLD_IS_LD, for consistency with CLANG_IS_CC

Reported by:	Dan McGregor <dan.mcgregor usask.ca>

MFC r313559 | glebius | 2017-02-10 18:34:48 +0100 (Fri, 10 Feb 2017) | 5 lines

Don't check struct rtentry on FreeBSD, it is an internal kernel structure.
On other systems it may be API structure for SIOCADDRT/SIOCDELRT.

Reviewed by:	emaste, dim

MFC r314152 (by jkim):

Remove an assembler flag, which is redundant since r309124.  The upstream
took care of it by introducing a macro NO_EXEC_STACK_DIRECTIVE.

http://llvm.org/viewvc/llvm-project?rev=273500&view=rev

Reviewed by:	dim

MFC r314564:

Upgrade our copies of clang, llvm, lld, lldb, compiler-rt and libc++ to
4.0.0 (branches/release_40 296509).  The release will follow soon.

Please note that from 3.5.0 onwards, clang, llvm and lldb require C++11
support to build; see UPDATING for more information.

Also note that as of 4.0.0, lld should be able to link the base system
on amd64 and aarch64.  See the WITH_LLD_IS_LLD setting in src.conf(5).
Though please be aware that this is work in progress.

Release notes for llvm, clang and lld will be available here:
<http://releases.llvm.org/4.0.0/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/clang/docs/ReleaseNotes.html>
<http://releases.llvm.org/4.0.0/tools/lld/docs/ReleaseNotes.html>

Thanks to Ed Maste, Jan Beich, Antoine Brodin and Eric Fiselier for
their help.

Relnotes:	yes
Exp-run:	antoine
PR:		215969, 216008

MFC r314708:

For now, revert r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

This commit is the cause of excessive compile times on skein_block.c
(and possibly other files) during kernel builds on amd64.

We never saw the problematic behavior described in this upstream commit,
so for now it is better to revert it.  An upstream bug has been filed
here: https://bugs.llvm.org/show_bug.cgi?id=32142

Reported by:	mjg

MFC r314795:

Reapply r287232 from upstream llvm trunk (by Daniil Fukalov):

  [SCEV] limit recursion depth of CompareSCEVComplexity

  Summary:
  CompareSCEVComplexity goes too deep (50+ on a quite a big unrolled
  loop) and runs almost infinite time.

  Added cache of "equal" SCEV pairs to earlier cutoff of further
  estimation. Recursion depth limit was also introduced as a parameter.

  Reviewers: sanjoy

  Subscribers: mzolotukhin, tstellarAMD, llvm-commits

  Differential Revision: https://reviews.llvm.org/D26389

Pull in r296992 from upstream llvm trunk (by Sanjoy Das):

  [SCEV] Decrease the recursion threshold for CompareValueComplexity

  Fixes PR32142.

  r287232 accidentally increased the recursion threshold for
  CompareValueComplexity from 2 to 32.  This change reverses that
  change by introducing a separate flag for CompareValueComplexity's
  threshold.

The latter revision fixes the excessive compile times for skein_block.c.

MFC r314907 | mmel | 2017-03-08 12:40:27 +0100 (Wed, 08 Mar 2017) | 7 lines

Unbreak ARMv6 world.

The new compiler_rt library imported with clang 4.0.0 have several fatal
issues (non-functional __udivsi3 for example) with ARM specific instrict
functions. As temporary workaround, until upstream solve these problems,
disable all thumb[1][2] related feature.

MFC r315016:

Update clang, llvm, lld, lldb, compiler-rt and libc++ to 4.0.0 release.
We were already very close to the last release candidate, so this is a
pretty minor update.

Relnotes:	yes

MFC r316005:

Revert r314907, and pull in r298713 from upstream compiler-rt trunk (by
Weiming Zhao):

  builtins: Select correct code fragments when compiling for Thumb1/Thum2/ARM ISA.

  Summary:
  Value of __ARM_ARCH_ISA_THUMB isn't based on the actual compilation
  mode (-mthumb, -marm), it reflect's capability of given CPU.

  Due to this:
   - use  __tbumb__ and __thumb2__ insteand of __ARM_ARCH_ISA_THUMB
   - use '.thumb' directive consistently  in all affected files
   - decorate all thumb functions using
     DEFINE_COMPILERRT_THUMB_FUNCTION()

  ---------
  Note: This patch doesn't fix broken Thumb1 variant of __udivsi3 !

  Reviewers: weimingz, rengolin, compnerd

  Subscribers: aemerson, dim

  Differential Revision: https://reviews.llvm.org/D30938

Discussed with:	mmel

1 files changed, 325 insertions, 430 deletions

diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectMultiword.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectMultiword.cpp
index c951e0b..0d0aa10 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectMultiword.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectMultiword.cpp
@@ -14,8 +14,8 @@
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 #include "lldb/Core/Debugger.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/Options.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
+#include "lldb/Interpreter/Options.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -28,496 +28,391 @@ CommandObjectMultiword::CommandObjectMultiword(CommandInterpreter &interpreter,
                                                const char *name,
                                                const char *help,
                                                const char *syntax,
-                                               uint32_t flags) :
-    CommandObject (interpreter, name, help, syntax, flags),
-    m_can_be_removed(false)
-{
-}
+                                               uint32_t flags)
+    : CommandObject(interpreter, name, help, syntax, flags),
+      m_can_be_removed(false) {}
 
 CommandObjectMultiword::~CommandObjectMultiword() = default;
 
-CommandObjectSP
-CommandObjectMultiword::GetSubcommandSP (const char *sub_cmd, StringList *matches)
-{
-    CommandObjectSP return_cmd_sp;
-    CommandObject::CommandMap::iterator pos;
-
-    if (!m_subcommand_dict.empty())
-    {
-        pos = m_subcommand_dict.find (sub_cmd);
-        if (pos != m_subcommand_dict.end()) {
-            // An exact match; append the sub_cmd to the 'matches' string list.
-            if (matches)
-                matches->AppendString(sub_cmd);
-            return_cmd_sp = pos->second;
-        }
-        else
-        {
-            StringList local_matches;
-            if (matches == nullptr)
-                matches = &local_matches;
-            int num_matches = AddNamesMatchingPartialString (m_subcommand_dict, sub_cmd, *matches);
-
-            if (num_matches == 1)
-            {
-                // Cleaner, but slightly less efficient would be to call back into this function, since I now
-                // know I have an exact match...
-
-                sub_cmd = matches->GetStringAtIndex(0);
-                pos = m_subcommand_dict.find(sub_cmd);
-                if (pos != m_subcommand_dict.end())
-                    return_cmd_sp = pos->second;
-            }
-        }
+CommandObjectSP CommandObjectMultiword::GetSubcommandSP(llvm::StringRef sub_cmd,
+                                                        StringList *matches) {
+  CommandObjectSP return_cmd_sp;
+  CommandObject::CommandMap::iterator pos;
+
+  if (!m_subcommand_dict.empty()) {
+    pos = m_subcommand_dict.find(sub_cmd);
+    if (pos != m_subcommand_dict.end()) {
+      // An exact match; append the sub_cmd to the 'matches' string list.
+      if (matches)
+        matches->AppendString(sub_cmd);
+      return_cmd_sp = pos->second;
+    } else {
+      StringList local_matches;
+      if (matches == nullptr)
+        matches = &local_matches;
+      int num_matches =
+          AddNamesMatchingPartialString(m_subcommand_dict, sub_cmd, *matches);
+
+      if (num_matches == 1) {
+        // Cleaner, but slightly less efficient would be to call back into this
+        // function, since I now
+        // know I have an exact match...
+
+        sub_cmd = matches->GetStringAtIndex(0);
+        pos = m_subcommand_dict.find(sub_cmd);
+        if (pos != m_subcommand_dict.end())
+          return_cmd_sp = pos->second;
+      }
     }
-    return return_cmd_sp;
+  }
+  return return_cmd_sp;
 }
 
 CommandObject *
-CommandObjectMultiword::GetSubcommandObject (const char *sub_cmd, StringList *matches)
-{
-    return GetSubcommandSP(sub_cmd, matches).get();
+CommandObjectMultiword::GetSubcommandObject(llvm::StringRef sub_cmd,
+                                            StringList *matches) {
+  return GetSubcommandSP(sub_cmd, matches).get();
 }
 
-bool
-CommandObjectMultiword::LoadSubCommand(const char *name,
-                                       const CommandObjectSP& cmd_obj)
-{
-    if (cmd_obj)
-        assert((&GetCommandInterpreter() == &cmd_obj->GetCommandInterpreter()) && "tried to add a CommandObject from a different interpreter");
-    
-    CommandMap::iterator pos;
-    bool success = true;
-
-    pos = m_subcommand_dict.find(name);
-    if (pos == m_subcommand_dict.end())
-    {
-        m_subcommand_dict[name] = cmd_obj;
-    }
-    else
-        success = false;
+bool CommandObjectMultiword::LoadSubCommand(llvm::StringRef name,
+                                            const CommandObjectSP &cmd_obj) {
+  if (cmd_obj)
+    assert((&GetCommandInterpreter() == &cmd_obj->GetCommandInterpreter()) &&
+           "tried to add a CommandObject from a different interpreter");
+
+  CommandMap::iterator pos;
+  bool success = true;
 
-    return success;
+  pos = m_subcommand_dict.find(name);
+  if (pos == m_subcommand_dict.end()) {
+    m_subcommand_dict[name] = cmd_obj;
+  } else
+    success = false;
+
+  return success;
 }
 
-bool
-CommandObjectMultiword::Execute(const char *args_string, CommandReturnObject &result)
-{
-    Args args (args_string);
-    const size_t argc = args.GetArgumentCount();
-    if (argc == 0)
-    {
-        this->CommandObject::GenerateHelpText (result);
-    }
-    else
-    {
-        const char *sub_command = args.GetArgumentAtIndex (0);
-
-        if (sub_command)
-        {
-            if (::strcasecmp (sub_command, "help") == 0)
-            {
-                this->CommandObject::GenerateHelpText (result);
-            }
-            else if (!m_subcommand_dict.empty())
-            {
-                StringList matches;
-                CommandObject *sub_cmd_obj = GetSubcommandObject(sub_command, &matches);
-                if (sub_cmd_obj != nullptr)
-                {
-                    // Now call CommandObject::Execute to process and options in 'rest_of_line'.  From there
-                    // the command-specific version of Execute will be called, with the processed arguments.
-
-                    args.Shift();
-
-                    sub_cmd_obj->Execute (args_string, result);
-                }
-                else
-                {
-                    std::string error_msg;
-                    const size_t num_subcmd_matches = matches.GetSize();
-                    if (num_subcmd_matches > 0)
-                        error_msg.assign ("ambiguous command ");
-                    else
-                        error_msg.assign ("invalid command ");
-
-                    error_msg.append ("'");
-                    error_msg.append (GetCommandName());
-                    error_msg.append (" ");
-                    error_msg.append (sub_command);
-                    error_msg.append ("'.");
-
-                    if (num_subcmd_matches > 0)
-                    {
-                        error_msg.append (" Possible completions:");
-                        for (size_t i = 0; i < num_subcmd_matches; i++)
-                        {
-                            error_msg.append ("\n\t");
-                            error_msg.append (matches.GetStringAtIndex (i));
-                        }
-                    }
-                    error_msg.append ("\n");
-                    result.AppendRawError (error_msg.c_str());
-                    result.SetStatus (eReturnStatusFailed);
-                }
-            }
-            else
-            {
-                result.AppendErrorWithFormat ("'%s' does not have any subcommands.\n", GetCommandName());
-                result.SetStatus (eReturnStatusFailed);
-            }
-        }
-    }
+bool CommandObjectMultiword::Execute(const char *args_string,
+                                     CommandReturnObject &result) {
+  Args args(args_string);
+  const size_t argc = args.GetArgumentCount();
+  if (argc == 0) {
+    this->CommandObject::GenerateHelpText(result);
+    return result.Succeeded();
+  }
 
+  auto sub_command = args[0].ref;
+  if (sub_command.empty())
     return result.Succeeded();
-}
 
-void
-CommandObjectMultiword::GenerateHelpText (Stream &output_stream)
-{
-    // First time through here, generate the help text for the object and
-    // push it to the return result object as well
-
-    CommandObject::GenerateHelpText(output_stream);
-    output_stream.PutCString("\nThe following subcommands are supported:\n\n");
-
-    CommandMap::iterator pos;
-    uint32_t max_len = FindLongestCommandWord (m_subcommand_dict);
-
-    if (max_len)
-        max_len += 4; // Indent the output by 4 spaces.
-
-    for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos)
-    {
-        std::string indented_command ("    ");
-        indented_command.append (pos->first);
-        if (pos->second->WantsRawCommandString ())
-        {
-            std::string help_text (pos->second->GetHelp());
-            help_text.append("  Expects 'raw' input (see 'help raw-input'.)");
-            m_interpreter.OutputFormattedHelpText (output_stream,
-                                                   indented_command.c_str(),
-                                                   "--",
-                                                   help_text.c_str(),
-                                                   max_len);
-        }
-        else
-            m_interpreter.OutputFormattedHelpText (output_stream, 
-                                                   indented_command.c_str(),
-                                                   "--", 
-                                                   pos->second->GetHelp(), 
-                                                   max_len);
+  if (sub_command.equals_lower("help")) {
+    this->CommandObject::GenerateHelpText(result);
+    return result.Succeeded();
+  }
+
+  if (m_subcommand_dict.empty()) {
+    result.AppendErrorWithFormat("'%s' does not have any subcommands.\n",
+                                 GetCommandName().str().c_str());
+    result.SetStatus(eReturnStatusFailed);
+    return false;
+  }
+
+  StringList matches;
+  CommandObject *sub_cmd_obj = GetSubcommandObject(sub_command, &matches);
+  if (sub_cmd_obj != nullptr) {
+    // Now call CommandObject::Execute to process options in `rest_of_line`.
+    // From there the command-specific version of Execute will be called,
+    // with the processed arguments.
+
+    args.Shift();
+    sub_cmd_obj->Execute(args_string, result);
+    return result.Succeeded();
+  }
+
+  std::string error_msg;
+  const size_t num_subcmd_matches = matches.GetSize();
+  if (num_subcmd_matches > 0)
+    error_msg.assign("ambiguous command ");
+  else
+    error_msg.assign("invalid command ");
+
+  error_msg.append("'");
+  error_msg.append(GetCommandName());
+  error_msg.append(" ");
+  error_msg.append(sub_command);
+  error_msg.append("'.");
+
+  if (num_subcmd_matches > 0) {
+    error_msg.append(" Possible completions:");
+    for (size_t i = 0; i < num_subcmd_matches; i++) {
+      error_msg.append("\n\t");
+      error_msg.append(matches.GetStringAtIndex(i));
     }
+  }
+  error_msg.append("\n");
+  result.AppendRawError(error_msg.c_str());
+  result.SetStatus(eReturnStatusFailed);
+  return false;
+}
 
-    output_stream.PutCString ("\nFor more help on any particular subcommand, type 'help <command> <subcommand>'.\n");
+void CommandObjectMultiword::GenerateHelpText(Stream &output_stream) {
+  // First time through here, generate the help text for the object and
+  // push it to the return result object as well
+
+  CommandObject::GenerateHelpText(output_stream);
+  output_stream.PutCString("\nThe following subcommands are supported:\n\n");
+
+  CommandMap::iterator pos;
+  uint32_t max_len = FindLongestCommandWord(m_subcommand_dict);
+
+  if (max_len)
+    max_len += 4; // Indent the output by 4 spaces.
+
+  for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos) {
+    std::string indented_command("    ");
+    indented_command.append(pos->first);
+    if (pos->second->WantsRawCommandString()) {
+      std::string help_text(pos->second->GetHelp());
+      help_text.append("  Expects 'raw' input (see 'help raw-input'.)");
+      m_interpreter.OutputFormattedHelpText(output_stream,
+                                            indented_command.c_str(), "--",
+                                            help_text.c_str(), max_len);
+    } else
+      m_interpreter.OutputFormattedHelpText(output_stream,
+                                            indented_command.c_str(), "--",
+                                            pos->second->GetHelp(), max_len);
+  }
+
+  output_stream.PutCString("\nFor more help on any particular subcommand, type "
+                           "'help <command> <subcommand>'.\n");
 }
 
-int
-CommandObjectMultiword::HandleCompletion(Args &input,
-                                         int &cursor_index,
-                                         int &cursor_char_position,
-                                         int match_start_point,
-                                         int max_return_elements,
-                                         bool &word_complete,
-                                         StringList &matches)
-{
-    // Any of the command matches will provide a complete word, otherwise the individual
-    // completers will override this.
-    word_complete = true;
-    
-    const char *arg0 = input.GetArgumentAtIndex(0);
-    if (cursor_index == 0)
-    {
-        AddNamesMatchingPartialString (m_subcommand_dict,
-                                       arg0,
-                                       matches);
-
-        if (matches.GetSize() == 1
-            && matches.GetStringAtIndex(0) != nullptr
-            && strcmp (arg0, matches.GetStringAtIndex(0)) == 0)
-        {
-            StringList temp_matches;
-            CommandObject *cmd_obj = GetSubcommandObject (arg0,
-                                                          &temp_matches);
-            if (cmd_obj != nullptr)
-            {
-                if (input.GetArgumentCount() == 1)
-                {
-                    word_complete = true;
-                }
-                else
-                {
-                    matches.DeleteStringAtIndex (0);
-                    input.Shift();
-                    cursor_char_position = 0;
-                    input.AppendArgument ("");
-                    return cmd_obj->HandleCompletion (input,
-                                                      cursor_index,
-                                                      cursor_char_position,
-                                                      match_start_point,
-                                                      max_return_elements,
-                                                      word_complete,
-                                                      matches);
-                }
-            }
+int CommandObjectMultiword::HandleCompletion(Args &input, int &cursor_index,
+                                             int &cursor_char_position,
+                                             int match_start_point,
+                                             int max_return_elements,
+                                             bool &word_complete,
+                                             StringList &matches) {
+  // Any of the command matches will provide a complete word, otherwise the
+  // individual completers will override this.
+  word_complete = true;
+
+  auto arg0 = input[0].ref;
+  if (cursor_index == 0) {
+    AddNamesMatchingPartialString(m_subcommand_dict, arg0, matches);
+
+    if (matches.GetSize() == 1 && matches.GetStringAtIndex(0) != nullptr &&
+        (arg0 == matches.GetStringAtIndex(0))) {
+      StringList temp_matches;
+      CommandObject *cmd_obj = GetSubcommandObject(arg0, &temp_matches);
+      if (cmd_obj != nullptr) {
+        if (input.GetArgumentCount() == 1) {
+          word_complete = true;
+        } else {
+          matches.DeleteStringAtIndex(0);
+          input.Shift();
+          cursor_char_position = 0;
+          input.AppendArgument(llvm::StringRef());
+          return cmd_obj->HandleCompletion(
+              input, cursor_index, cursor_char_position, match_start_point,
+              max_return_elements, word_complete, matches);
         }
-        return matches.GetSize();
+      }
     }
-    else
-    {
-        CommandObject *sub_command_object = GetSubcommandObject (arg0,
-                                                                 &matches);
-        if (sub_command_object == nullptr)
-        {
-            return matches.GetSize();
-        }
-        else
-        {
-            // Remove the one match that we got from calling GetSubcommandObject.
-            matches.DeleteStringAtIndex(0);
-            input.Shift();
-            cursor_index--;
-            return sub_command_object->HandleCompletion (input, 
-                                                         cursor_index, 
-                                                         cursor_char_position, 
-                                                         match_start_point,
-                                                         max_return_elements,
-                                                         word_complete,
-                                                         matches);
-        }
+    return matches.GetSize();
+  } else {
+    CommandObject *sub_command_object = GetSubcommandObject(arg0, &matches);
+    if (sub_command_object == nullptr) {
+      return matches.GetSize();
+    } else {
+      // Remove the one match that we got from calling GetSubcommandObject.
+      matches.DeleteStringAtIndex(0);
+      input.Shift();
+      cursor_index--;
+      return sub_command_object->HandleCompletion(
+          input, cursor_index, cursor_char_position, match_start_point,
+          max_return_elements, word_complete, matches);
     }
+  }
 }
 
-const char *
-CommandObjectMultiword::GetRepeatCommand (Args &current_command_args, uint32_t index)
-{
-    index++;
-    if (current_command_args.GetArgumentCount() <= index)
-        return nullptr;
-    CommandObject *sub_command_object = GetSubcommandObject (current_command_args.GetArgumentAtIndex(index));
-    if (sub_command_object == nullptr)
-        return nullptr;
-    return sub_command_object->GetRepeatCommand(current_command_args, index);
+const char *CommandObjectMultiword::GetRepeatCommand(Args &current_command_args,
+                                                     uint32_t index) {
+  index++;
+  if (current_command_args.GetArgumentCount() <= index)
+    return nullptr;
+  CommandObject *sub_command_object =
+      GetSubcommandObject(current_command_args[index].ref);
+  if (sub_command_object == nullptr)
+    return nullptr;
+  return sub_command_object->GetRepeatCommand(current_command_args, index);
 }
 
-void
-CommandObjectMultiword::AproposAllSubCommands (const char *prefix,
-                                               const char *search_word,
-                                               StringList &commands_found,
-                                               StringList &commands_help)
-{
-    CommandObject::CommandMap::const_iterator pos;
-
-    for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos)
-    {
-        const char * command_name = pos->first.c_str();
-        CommandObject *sub_cmd_obj = pos->second.get();
-        StreamString complete_command_name;
-        
-        complete_command_name.Printf ("%s %s", prefix, command_name);
-        
-        if (sub_cmd_obj->HelpTextContainsWord (search_word))
-        {
-            commands_found.AppendString (complete_command_name.GetData());
-            commands_help.AppendString (sub_cmd_obj->GetHelp());
-        }
-        
-        if (sub_cmd_obj->IsMultiwordObject())
-            sub_cmd_obj->AproposAllSubCommands (complete_command_name.GetData(),
-                                                search_word,
-                                                commands_found,
-                                                commands_help);
+void CommandObjectMultiword::AproposAllSubCommands(llvm::StringRef prefix,
+                                                   llvm::StringRef search_word,
+                                                   StringList &commands_found,
+                                                   StringList &commands_help) {
+  CommandObject::CommandMap::const_iterator pos;
+
+  for (pos = m_subcommand_dict.begin(); pos != m_subcommand_dict.end(); ++pos) {
+    const char *command_name = pos->first.c_str();
+    CommandObject *sub_cmd_obj = pos->second.get();
+    StreamString complete_command_name;
+
+    complete_command_name << prefix << " " << command_name;
+
+    if (sub_cmd_obj->HelpTextContainsWord(search_word)) {
+      commands_found.AppendString(complete_command_name.GetString());
+      commands_help.AppendString(sub_cmd_obj->GetHelp());
     }
-}
 
-CommandObjectProxy::CommandObjectProxy (CommandInterpreter &interpreter,
-                                        const char *name,
-                                        const char *help,
-                                        const char *syntax,
-                                        uint32_t flags) :
-    CommandObject (interpreter, name, help, syntax, flags)
-{
+    if (sub_cmd_obj->IsMultiwordObject())
+      sub_cmd_obj->AproposAllSubCommands(complete_command_name.GetString(),
+                                         search_word, commands_found,
+                                         commands_help);
+  }
 }
 
+CommandObjectProxy::CommandObjectProxy(CommandInterpreter &interpreter,
+                                       const char *name, const char *help,
+                                       const char *syntax, uint32_t flags)
+    : CommandObject(interpreter, name, help, syntax, flags) {}
+
 CommandObjectProxy::~CommandObjectProxy() = default;
 
-const char *
-CommandObjectProxy::GetHelpLong ()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetHelpLong();
-    return nullptr;
+llvm::StringRef CommandObjectProxy::GetHelpLong() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetHelpLong();
+  return llvm::StringRef();
 }
 
-bool
-CommandObjectProxy::IsRemovable() const
-{
-    const CommandObject *proxy_command = const_cast<CommandObjectProxy *>(this)->GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->IsRemovable();
-    return false;
+bool CommandObjectProxy::IsRemovable() const {
+  const CommandObject *proxy_command =
+      const_cast<CommandObjectProxy *>(this)->GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->IsRemovable();
+  return false;
 }
 
-bool
-CommandObjectProxy::IsMultiwordObject ()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->IsMultiwordObject();
-    return false;
+bool CommandObjectProxy::IsMultiwordObject() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->IsMultiwordObject();
+  return false;
 }
 
-CommandObjectMultiword*
-CommandObjectProxy::GetAsMultiwordCommand ()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetAsMultiwordCommand();
-    return nullptr;
+CommandObjectMultiword *CommandObjectProxy::GetAsMultiwordCommand() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetAsMultiwordCommand();
+  return nullptr;
 }
 
-void
-CommandObjectProxy::GenerateHelpText (Stream &result)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GenerateHelpText(result);
+void CommandObjectProxy::GenerateHelpText(Stream &result) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GenerateHelpText(result);
 }
 
 lldb::CommandObjectSP
-CommandObjectProxy::GetSubcommandSP (const char *sub_cmd, StringList *matches)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetSubcommandSP(sub_cmd, matches);
-    return lldb::CommandObjectSP();
+CommandObjectProxy::GetSubcommandSP(llvm::StringRef sub_cmd,
+                                    StringList *matches) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetSubcommandSP(sub_cmd, matches);
+  return lldb::CommandObjectSP();
 }
 
-CommandObject *
-CommandObjectProxy::GetSubcommandObject (const char *sub_cmd, StringList *matches)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetSubcommandObject(sub_cmd, matches);
-    return nullptr;
+CommandObject *CommandObjectProxy::GetSubcommandObject(llvm::StringRef sub_cmd,
+                                                       StringList *matches) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetSubcommandObject(sub_cmd, matches);
+  return nullptr;
 }
 
-void
-CommandObjectProxy::AproposAllSubCommands (const char *prefix,
-                                           const char *search_word,
-                                           StringList &commands_found,
-                                           StringList &commands_help)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->AproposAllSubCommands (prefix,
-                                                     search_word,
-                                                     commands_found,
-                                                     commands_help);
+void CommandObjectProxy::AproposAllSubCommands(llvm::StringRef prefix,
+                                               llvm::StringRef search_word,
+                                               StringList &commands_found,
+                                               StringList &commands_help) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->AproposAllSubCommands(prefix, search_word,
+                                                commands_found, commands_help);
 }
 
-bool
-CommandObjectProxy::LoadSubCommand (const char *cmd_name,
-                                    const lldb::CommandObjectSP& command_sp)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->LoadSubCommand (cmd_name, command_sp);
-    return false;
+bool CommandObjectProxy::LoadSubCommand(
+    llvm::StringRef cmd_name, const lldb::CommandObjectSP &command_sp) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->LoadSubCommand(cmd_name, command_sp);
+  return false;
 }
 
-bool
-CommandObjectProxy::WantsRawCommandString()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->WantsRawCommandString();
-    return false;
+bool CommandObjectProxy::WantsRawCommandString() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->WantsRawCommandString();
+  return false;
 }
 
-bool
-CommandObjectProxy::WantsCompletion()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->WantsCompletion();
-    return false;
+bool CommandObjectProxy::WantsCompletion() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->WantsCompletion();
+  return false;
 }
 
-Options *
-CommandObjectProxy::GetOptions ()
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetOptions ();
-    return nullptr;
+Options *CommandObjectProxy::GetOptions() {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetOptions();
+  return nullptr;
 }
 
-int
-CommandObjectProxy::HandleCompletion (Args &input,
-                                      int &cursor_index,
-                                      int &cursor_char_position,
-                                      int match_start_point,
-                                      int max_return_elements,
-                                      bool &word_complete,
-                                      StringList &matches)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->HandleCompletion (input,
-                                                cursor_index,
-                                                cursor_char_position,
-                                                match_start_point,
-                                                max_return_elements,
-                                                word_complete,
-                                                matches);
-    matches.Clear();
-    return 0;
+int CommandObjectProxy::HandleCompletion(Args &input, int &cursor_index,
+                                         int &cursor_char_position,
+                                         int match_start_point,
+                                         int max_return_elements,
+                                         bool &word_complete,
+                                         StringList &matches) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->HandleCompletion(
+        input, cursor_index, cursor_char_position, match_start_point,
+        max_return_elements, word_complete, matches);
+  matches.Clear();
+  return 0;
 }
 
-int
-CommandObjectProxy::HandleArgumentCompletion (Args &input,
-                                              int &cursor_index,
-                                              int &cursor_char_position,
-                                              OptionElementVector &opt_element_vector,
-                                              int match_start_point,
-                                              int max_return_elements,
-                                              bool &word_complete,
-                                              StringList &matches)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->HandleArgumentCompletion (input,
-                                                        cursor_index,
-                                                        cursor_char_position,
-                                                        opt_element_vector,
-                                                        match_start_point,
-                                                        max_return_elements,
-                                                        word_complete,
-                                                        matches);
-    matches.Clear();
-    return 0;
+int CommandObjectProxy::HandleArgumentCompletion(
+    Args &input, int &cursor_index, int &cursor_char_position,
+    OptionElementVector &opt_element_vector, int match_start_point,
+    int max_return_elements, bool &word_complete, StringList &matches) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->HandleArgumentCompletion(
+        input, cursor_index, cursor_char_position, opt_element_vector,
+        match_start_point, max_return_elements, word_complete, matches);
+  matches.Clear();
+  return 0;
 }
 
-const char *
-CommandObjectProxy::GetRepeatCommand (Args &current_command_args,
-                                      uint32_t index)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->GetRepeatCommand (current_command_args, index);
-    return nullptr;
+const char *CommandObjectProxy::GetRepeatCommand(Args &current_command_args,
+                                                 uint32_t index) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->GetRepeatCommand(current_command_args, index);
+  return nullptr;
 }
 
-bool
-CommandObjectProxy::Execute (const char *args_string,
-                             CommandReturnObject &result)
-{
-    CommandObject *proxy_command = GetProxyCommandObject();
-    if (proxy_command)
-        return proxy_command->Execute (args_string, result);
-    result.AppendError ("command is not implemented");
-    result.SetStatus (eReturnStatusFailed);
-    return false;
+bool CommandObjectProxy::Execute(const char *args_string,
+                                 CommandReturnObject &result) {
+  CommandObject *proxy_command = GetProxyCommandObject();
+  if (proxy_command)
+    return proxy_command->Execute(args_string, result);
+  result.AppendError("command is not implemented");
+  result.SetStatus(eReturnStatusFailed);
+  return false;
 }