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, 315 insertions, 349 deletions

diff --git a/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp b/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp
index ea049ae..79777c8 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Socket.cpp
@@ -15,7 +15,6 @@
 #include "lldb/Host/Host.h"
 #include "lldb/Host/SocketAddress.h"
 #include "lldb/Host/StringConvert.h"
-#include "lldb/Host/TimeValue.h"
 #include "lldb/Host/common/TCPSocket.h"
 #include "lldb/Host/common/UDPSocket.h"
 
@@ -34,456 +33,423 @@
 #include "lldb/Host/linux/AbstractSocket.h"
 #endif
 
-#ifdef __ANDROID_NDK__
-#include <linux/tcp.h>
-#include <bits/error_constants.h>
+#ifdef __ANDROID__
+#include <arpa/inet.h>
 #include <asm-generic/errno-base.h>
 #include <errno.h>
-#include <arpa/inet.h>
+#include <linux/tcp.h>
 #if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC)
-#include <unistd.h>
-#include <sys/syscall.h>
 #include <fcntl.h>
+#include <sys/syscall.h>
+#include <unistd.h>
 #endif // ANDROID_ARM_BUILD_STATIC || ANDROID_MIPS_BUILD_STATIC
-#endif // __ANDROID_NDK__
+#endif // __ANDROID__
 
 using namespace lldb;
 using namespace lldb_private;
 
 #if defined(_WIN32)
-typedef const char * set_socket_option_arg_type;
-typedef char * get_socket_option_arg_type;
+typedef const char *set_socket_option_arg_type;
+typedef char *get_socket_option_arg_type;
 const NativeSocket Socket::kInvalidSocketValue = INVALID_SOCKET;
-#else // #if defined(_WIN32)
-typedef const void * set_socket_option_arg_type;
-typedef void * get_socket_option_arg_type;
+#else  // #if defined(_WIN32)
+typedef const void *set_socket_option_arg_type;
+typedef void *get_socket_option_arg_type;
 const NativeSocket Socket::kInvalidSocketValue = -1;
 #endif // #if defined(_WIN32)
 
 namespace {
 
-bool IsInterrupted()
-{
+bool IsInterrupted() {
 #if defined(_WIN32)
-    return ::WSAGetLastError() == WSAEINTR;
+  return ::WSAGetLastError() == WSAEINTR;
 #else
-    return errno == EINTR;
+  return errno == EINTR;
 #endif
 }
-
 }
 
 Socket::Socket(NativeSocket socket, SocketProtocol protocol, bool should_close)
-    : IOObject(eFDTypeSocket, should_close)
-    , m_protocol(protocol)
-    , m_socket(socket)
-{
-
-}
-
-Socket::~Socket()
-{
-    Close();
-}
-
-std::unique_ptr<Socket> Socket::Create(const SocketProtocol protocol, bool child_processes_inherit, Error &error)
-{
-    error.Clear();
-
-    std::unique_ptr<Socket> socket_up;
-    switch (protocol)
-    {
-    case ProtocolTcp:
-        socket_up.reset(new TCPSocket(child_processes_inherit, error));
-        break;
-    case ProtocolUdp:
-        socket_up.reset(new UDPSocket(child_processes_inherit, error));
-        break;
-    case ProtocolUnixDomain:
+    : IOObject(eFDTypeSocket, should_close), m_protocol(protocol),
+      m_socket(socket) {}
+
+Socket::~Socket() { Close(); }
+
+std::unique_ptr<Socket> Socket::Create(const SocketProtocol protocol,
+                                       bool child_processes_inherit,
+                                       Error &error) {
+  error.Clear();
+
+  std::unique_ptr<Socket> socket_up;
+  switch (protocol) {
+  case ProtocolTcp:
+    socket_up.reset(new TCPSocket(child_processes_inherit, error));
+    break;
+  case ProtocolUdp:
+    socket_up.reset(new UDPSocket(child_processes_inherit, error));
+    break;
+  case ProtocolUnixDomain:
 #ifndef LLDB_DISABLE_POSIX
-        socket_up.reset(new DomainSocket(child_processes_inherit, error));
+    socket_up.reset(new DomainSocket(child_processes_inherit, error));
 #else
-        error.SetErrorString("Unix domain sockets are not supported on this platform.");
+    error.SetErrorString(
+        "Unix domain sockets are not supported on this platform.");
 #endif
-        break;
-    case ProtocolUnixAbstract:
+    break;
+  case ProtocolUnixAbstract:
 #ifdef __linux__
-        socket_up.reset(new AbstractSocket(child_processes_inherit, error));
+    socket_up.reset(new AbstractSocket(child_processes_inherit, error));
 #else
-        error.SetErrorString("Abstract domain sockets are not supported on this platform.");
+    error.SetErrorString(
+        "Abstract domain sockets are not supported on this platform.");
 #endif
-        break;
-    }
+    break;
+  }
 
-    if (error.Fail())
-        socket_up.reset();
+  if (error.Fail())
+    socket_up.reset();
 
-    return socket_up;
+  return socket_up;
 }
 
-Error Socket::TcpConnect(llvm::StringRef host_and_port, bool child_processes_inherit, Socket *&socket)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION));
-    if (log)
-        log->Printf ("Socket::%s (host/port = %s)", __FUNCTION__, host_and_port.data());
-
-    Error error;
-    std::unique_ptr<Socket> connect_socket(Create(ProtocolTcp, child_processes_inherit, error));
-    if (error.Fail())
-        return error;
+Error Socket::TcpConnect(llvm::StringRef host_and_port,
+                         bool child_processes_inherit, Socket *&socket) {
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_COMMUNICATION));
+  if (log)
+    log->Printf("Socket::%s (host/port = %s)", __FUNCTION__,
+                host_and_port.data());
+
+  Error error;
+  std::unique_ptr<Socket> connect_socket(
+      Create(ProtocolTcp, child_processes_inherit, error));
+  if (error.Fail())
+    return error;
 
-    error = connect_socket->Connect(host_and_port);
-    if (error.Success())
-      socket = connect_socket.release();
+  error = connect_socket->Connect(host_and_port);
+  if (error.Success())
+    socket = connect_socket.release();
 
-    return error;
+  return error;
 }
 
-Error
-Socket::TcpListen (llvm::StringRef host_and_port,
-                   bool child_processes_inherit,
-                   Socket *&socket,
-                   Predicate<uint16_t>* predicate,
-                   int backlog)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
-    if (log)
-        log->Printf ("Socket::%s (%s)", __FUNCTION__, host_and_port.data());
-
-    Error error;
-    std::string host_str;
-    std::string port_str;
-    int32_t port = INT32_MIN;
-    if (!DecodeHostAndPort (host_and_port, host_str, port_str, port, &error))
-        return error;
-
-    std::unique_ptr<TCPSocket> listen_socket(new TCPSocket(child_processes_inherit, error));
-    if (error.Fail())
-        return error;
-
-    error = listen_socket->Listen(host_and_port, backlog);
-    if (error.Success())
-    {
-        // We were asked to listen on port zero which means we
-        // must now read the actual port that was given to us
-        // as port zero is a special code for "find an open port
-        // for me".
-        if (port == 0)
-            port = listen_socket->GetLocalPortNumber();
-
-        // Set the port predicate since when doing a listen://<host>:<port>
-        // it often needs to accept the incoming connection which is a blocking
-        // system call. Allowing access to the bound port using a predicate allows
-        // us to wait for the port predicate to be set to a non-zero value from
-        // another thread in an efficient manor.
-        if (predicate)
-            predicate->SetValue (port, eBroadcastAlways);
-        socket = listen_socket.release();
-    }
+Error Socket::TcpListen(llvm::StringRef host_and_port,
+                        bool child_processes_inherit, Socket *&socket,
+                        Predicate<uint16_t> *predicate, int backlog) {
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION));
+  if (log)
+    log->Printf("Socket::%s (%s)", __FUNCTION__, host_and_port.data());
+
+  Error error;
+  std::string host_str;
+  std::string port_str;
+  int32_t port = INT32_MIN;
+  if (!DecodeHostAndPort(host_and_port, host_str, port_str, port, &error))
+    return error;
 
+  std::unique_ptr<TCPSocket> listen_socket(
+      new TCPSocket(child_processes_inherit, error));
+  if (error.Fail())
     return error;
+
+  error = listen_socket->Listen(host_and_port, backlog);
+  if (error.Success()) {
+    // We were asked to listen on port zero which means we
+    // must now read the actual port that was given to us
+    // as port zero is a special code for "find an open port
+    // for me".
+    if (port == 0)
+      port = listen_socket->GetLocalPortNumber();
+
+    // Set the port predicate since when doing a listen://<host>:<port>
+    // it often needs to accept the incoming connection which is a blocking
+    // system call. Allowing access to the bound port using a predicate allows
+    // us to wait for the port predicate to be set to a non-zero value from
+    // another thread in an efficient manor.
+    if (predicate)
+      predicate->SetValue(port, eBroadcastAlways);
+    socket = listen_socket.release();
+  }
+
+  return error;
 }
 
-Error Socket::UdpConnect(llvm::StringRef host_and_port, bool child_processes_inherit, Socket *&send_socket, Socket *&recv_socket)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
-    if (log)
-        log->Printf ("Socket::%s (host/port = %s)", __FUNCTION__, host_and_port.data());
+Error Socket::UdpConnect(llvm::StringRef host_and_port,
+                         bool child_processes_inherit, Socket *&send_socket,
+                         Socket *&recv_socket) {
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION));
+  if (log)
+    log->Printf("Socket::%s (host/port = %s)", __FUNCTION__,
+                host_and_port.data());
 
-    return UDPSocket::Connect(host_and_port, child_processes_inherit, send_socket, recv_socket);
+  return UDPSocket::Connect(host_and_port, child_processes_inherit, send_socket,
+                            recv_socket);
 }
 
-Error Socket::UnixDomainConnect(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
-{
-    Error error;
-    std::unique_ptr<Socket> connect_socket(Create(ProtocolUnixDomain, child_processes_inherit, error));
-    if (error.Fail())
-        return error;
+Error Socket::UnixDomainConnect(llvm::StringRef name,
+                                bool child_processes_inherit, Socket *&socket) {
+  Error error;
+  std::unique_ptr<Socket> connect_socket(
+      Create(ProtocolUnixDomain, child_processes_inherit, error));
+  if (error.Fail())
+    return error;
 
-    error = connect_socket->Connect(name);
-    if (error.Success())
-      socket = connect_socket.release();
+  error = connect_socket->Connect(name);
+  if (error.Success())
+    socket = connect_socket.release();
 
-    return error;
+  return error;
 }
 
-Error Socket::UnixDomainAccept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
-{
-    Error error;
-    std::unique_ptr<Socket> listen_socket(Create(ProtocolUnixDomain, child_processes_inherit, error));
-    if (error.Fail())
-        return error;
-
-    error = listen_socket->Listen(name, 5);
-    if (error.Fail())
-        return error;
+Error Socket::UnixDomainAccept(llvm::StringRef name,
+                               bool child_processes_inherit, Socket *&socket) {
+  Error error;
+  std::unique_ptr<Socket> listen_socket(
+      Create(ProtocolUnixDomain, child_processes_inherit, error));
+  if (error.Fail())
+    return error;
 
-    error = listen_socket->Accept(name, child_processes_inherit, socket);
+  error = listen_socket->Listen(name, 5);
+  if (error.Fail())
     return error;
+
+  error = listen_socket->Accept(name, child_processes_inherit, socket);
+  return error;
 }
 
-Error
-Socket::UnixAbstractConnect(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
-{
-    Error error;
-    std::unique_ptr<Socket> connect_socket(Create(ProtocolUnixAbstract, child_processes_inherit, error));
-    if (error.Fail())
-        return error;
-
-    error = connect_socket->Connect(name);
-    if (error.Success())
-      socket = connect_socket.release();
+Error Socket::UnixAbstractConnect(llvm::StringRef name,
+                                  bool child_processes_inherit,
+                                  Socket *&socket) {
+  Error error;
+  std::unique_ptr<Socket> connect_socket(
+      Create(ProtocolUnixAbstract, child_processes_inherit, error));
+  if (error.Fail())
     return error;
-}
 
-Error
-Socket::UnixAbstractAccept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
-{
-    Error error;
-    std::unique_ptr<Socket> listen_socket(Create(ProtocolUnixAbstract,child_processes_inherit, error));
-    if (error.Fail())
-        return error;
+  error = connect_socket->Connect(name);
+  if (error.Success())
+    socket = connect_socket.release();
+  return error;
+}
 
-    error = listen_socket->Listen(name, 5);
-    if (error.Fail())
-        return error;
+Error Socket::UnixAbstractAccept(llvm::StringRef name,
+                                 bool child_processes_inherit,
+                                 Socket *&socket) {
+  Error error;
+  std::unique_ptr<Socket> listen_socket(
+      Create(ProtocolUnixAbstract, child_processes_inherit, error));
+  if (error.Fail())
+    return error;
 
-    error = listen_socket->Accept(name, child_processes_inherit, socket);
+  error = listen_socket->Listen(name, 5);
+  if (error.Fail())
     return error;
-}
 
-bool
-Socket::DecodeHostAndPort(llvm::StringRef host_and_port,
-                          std::string &host_str,
-                          std::string &port_str,
-                          int32_t& port,
-                          Error *error_ptr)
-{
-    static RegularExpression g_regex ("([^:]+):([0-9]+)");
-    RegularExpression::Match regex_match(2);
-    if (g_regex.Execute (host_and_port.data(), &regex_match))
-    {
-        if (regex_match.GetMatchAtIndex (host_and_port.data(), 1, host_str) &&
-            regex_match.GetMatchAtIndex (host_and_port.data(), 2, port_str))
-        {
-            bool ok = false;
-            port = StringConvert::ToUInt32 (port_str.c_str(), UINT32_MAX, 10, &ok);
-            if (ok && port <= UINT16_MAX)
-            {
-                if (error_ptr)
-                    error_ptr->Clear();
-                return true;
-            }
-            // port is too large
-            if (error_ptr)
-                error_ptr->SetErrorStringWithFormat("invalid host:port specification: '%s'", host_and_port.data());
-            return false;
-        }
-    }
+  error = listen_socket->Accept(name, child_processes_inherit, socket);
+  return error;
+}
 
-    // If this was unsuccessful, then check if it's simply a signed 32-bit integer, representing
-    // a port with an empty host.
-    host_str.clear();
-    port_str.clear();
-    bool ok = false;
-    port = StringConvert::ToUInt32 (host_and_port.data(), UINT32_MAX, 10, &ok);
-    if (ok && port < UINT16_MAX)
-    {
-        port_str = host_and_port;
+bool Socket::DecodeHostAndPort(llvm::StringRef host_and_port,
+                               std::string &host_str, std::string &port_str,
+                               int32_t &port, Error *error_ptr) {
+  static RegularExpression g_regex(llvm::StringRef("([^:]+):([0-9]+)"));
+  RegularExpression::Match regex_match(2);
+  if (g_regex.Execute(host_and_port, &regex_match)) {
+    if (regex_match.GetMatchAtIndex(host_and_port.data(), 1, host_str) &&
+        regex_match.GetMatchAtIndex(host_and_port.data(), 2, port_str)) {
+      bool ok = false;
+      port = StringConvert::ToUInt32(port_str.c_str(), UINT32_MAX, 10, &ok);
+      if (ok && port <= UINT16_MAX) {
         if (error_ptr)
-            error_ptr->Clear();
+          error_ptr->Clear();
         return true;
+      }
+      // port is too large
+      if (error_ptr)
+        error_ptr->SetErrorStringWithFormat(
+            "invalid host:port specification: '%s'", host_and_port.data());
+      return false;
     }
-
+  }
+
+  // If this was unsuccessful, then check if it's simply a signed 32-bit
+  // integer, representing
+  // a port with an empty host.
+  host_str.clear();
+  port_str.clear();
+  bool ok = false;
+  port = StringConvert::ToUInt32(host_and_port.data(), UINT32_MAX, 10, &ok);
+  if (ok && port < UINT16_MAX) {
+    port_str = host_and_port;
     if (error_ptr)
-        error_ptr->SetErrorStringWithFormat("invalid host:port specification: '%s'", host_and_port.data());
-    return false;
+      error_ptr->Clear();
+    return true;
+  }
+
+  if (error_ptr)
+    error_ptr->SetErrorStringWithFormat("invalid host:port specification: '%s'",
+                                        host_and_port.data());
+  return false;
 }
 
-IOObject::WaitableHandle Socket::GetWaitableHandle()
-{
-    // TODO: On Windows, use WSAEventSelect
-    return m_socket;
+IOObject::WaitableHandle Socket::GetWaitableHandle() {
+  // TODO: On Windows, use WSAEventSelect
+  return m_socket;
 }
 
-Error Socket::Read (void *buf, size_t &num_bytes)
-{
-    Error error;
-    int bytes_received = 0;
-    do
-    {
-        bytes_received = ::recv (m_socket, static_cast<char *>(buf), num_bytes, 0);
-    } while (bytes_received < 0 && IsInterrupted ());
-
-    if (bytes_received < 0)
-    {
-        SetLastError (error);
-        num_bytes = 0;
-    }
-    else
-        num_bytes = bytes_received;
-
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION)); 
-    if (log)
-    {
-        log->Printf ("%p Socket::Read() (socket = %" PRIu64 ", src = %p, src_len = %" PRIu64 ", flags = 0) => %" PRIi64 " (error = %s)",
-                     static_cast<void*>(this), 
-                     static_cast<uint64_t>(m_socket),
-                     buf,
-                     static_cast<uint64_t>(num_bytes),
-                     static_cast<int64_t>(bytes_received),
-                     error.AsCString());
-    }
-
-    return error;
+Error Socket::Read(void *buf, size_t &num_bytes) {
+  Error error;
+  int bytes_received = 0;
+  do {
+    bytes_received = ::recv(m_socket, static_cast<char *>(buf), num_bytes, 0);
+  } while (bytes_received < 0 && IsInterrupted());
+
+  if (bytes_received < 0) {
+    SetLastError(error);
+    num_bytes = 0;
+  } else
+    num_bytes = bytes_received;
+
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_COMMUNICATION));
+  if (log) {
+    log->Printf("%p Socket::Read() (socket = %" PRIu64
+                ", src = %p, src_len = %" PRIu64 ", flags = 0) => %" PRIi64
+                " (error = %s)",
+                static_cast<void *>(this), static_cast<uint64_t>(m_socket), buf,
+                static_cast<uint64_t>(num_bytes),
+                static_cast<int64_t>(bytes_received), error.AsCString());
+  }
+
+  return error;
 }
 
-Error Socket::Write (const void *buf, size_t &num_bytes)
-{
-    Error error;
-    int bytes_sent = 0;
-    do
-    {
-        bytes_sent = Send(buf, num_bytes);
-    } while (bytes_sent < 0 && IsInterrupted ());
-
-    if (bytes_sent < 0)
-    {
-        SetLastError (error);
-        num_bytes = 0;
-    }
-    else
-        num_bytes = bytes_sent;
-
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION));
-    if (log)
-    {
-        log->Printf ("%p Socket::Write() (socket = %" PRIu64 ", src = %p, src_len = %" PRIu64 ", flags = 0) => %" PRIi64 " (error = %s)",
-                        static_cast<void*>(this), 
-                        static_cast<uint64_t>(m_socket),
-                        buf,
-                        static_cast<uint64_t>(num_bytes),
-                        static_cast<int64_t>(bytes_sent),
-                        error.AsCString());
-    }
-
-    return error;
+Error Socket::Write(const void *buf, size_t &num_bytes) {
+  Error error;
+  int bytes_sent = 0;
+  do {
+    bytes_sent = Send(buf, num_bytes);
+  } while (bytes_sent < 0 && IsInterrupted());
+
+  if (bytes_sent < 0) {
+    SetLastError(error);
+    num_bytes = 0;
+  } else
+    num_bytes = bytes_sent;
+
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_COMMUNICATION));
+  if (log) {
+    log->Printf("%p Socket::Write() (socket = %" PRIu64
+                ", src = %p, src_len = %" PRIu64 ", flags = 0) => %" PRIi64
+                " (error = %s)",
+                static_cast<void *>(this), static_cast<uint64_t>(m_socket), buf,
+                static_cast<uint64_t>(num_bytes),
+                static_cast<int64_t>(bytes_sent), error.AsCString());
+  }
+
+  return error;
 }
 
-Error Socket::PreDisconnect()
-{
-    Error error;
-    return error;
+Error Socket::PreDisconnect() {
+  Error error;
+  return error;
 }
 
-Error Socket::Close()
-{
-    Error error;
-    if (!IsValid() || !m_should_close_fd)
-        return error;
+Error Socket::Close() {
+  Error error;
+  if (!IsValid() || !m_should_close_fd)
+    return error;
 
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
-    if (log)
-        log->Printf ("%p Socket::Close (fd = %i)", static_cast<void*>(this), m_socket);
+  Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION));
+  if (log)
+    log->Printf("%p Socket::Close (fd = %i)", static_cast<void *>(this),
+                m_socket);
 
 #if defined(_WIN32)
-    bool success = !!closesocket(m_socket);
+  bool success = !!closesocket(m_socket);
 #else
-    bool success = !!::close (m_socket);
+  bool success = !!::close(m_socket);
 #endif
-    // A reference to a FD was passed in, set it to an invalid value
-    m_socket = kInvalidSocketValue;
-    if (!success)
-    {
-        SetLastError (error);
-    }
+  // A reference to a FD was passed in, set it to an invalid value
+  m_socket = kInvalidSocketValue;
+  if (!success) {
+    SetLastError(error);
+  }
 
-    return error;
+  return error;
 }
 
-
-int Socket::GetOption(int level, int option_name, int &option_value)
-{
-    get_socket_option_arg_type option_value_p = reinterpret_cast<get_socket_option_arg_type>(&option_value);
-    socklen_t option_value_size = sizeof(int);
-    return ::getsockopt(m_socket, level, option_name, option_value_p, &option_value_size);
+int Socket::GetOption(int level, int option_name, int &option_value) {
+  get_socket_option_arg_type option_value_p =
+      reinterpret_cast<get_socket_option_arg_type>(&option_value);
+  socklen_t option_value_size = sizeof(int);
+  return ::getsockopt(m_socket, level, option_name, option_value_p,
+                      &option_value_size);
 }
 
-int Socket::SetOption(int level, int option_name, int option_value)
-{
-    set_socket_option_arg_type option_value_p = reinterpret_cast<get_socket_option_arg_type>(&option_value);
-    return ::setsockopt(m_socket, level, option_name, option_value_p, sizeof(option_value));
+int Socket::SetOption(int level, int option_name, int option_value) {
+  set_socket_option_arg_type option_value_p =
+      reinterpret_cast<get_socket_option_arg_type>(&option_value);
+  return ::setsockopt(m_socket, level, option_name, option_value_p,
+                      sizeof(option_value));
 }
 
-size_t Socket::Send(const void *buf, const size_t num_bytes)
-{
-    return ::send (m_socket, static_cast<const char *>(buf), num_bytes, 0);
+size_t Socket::Send(const void *buf, const size_t num_bytes) {
+  return ::send(m_socket, static_cast<const char *>(buf), num_bytes, 0);
 }
 
-void Socket::SetLastError(Error &error)
-{
+void Socket::SetLastError(Error &error) {
 #if defined(_WIN32)
-    error.SetError(::WSAGetLastError(), lldb::eErrorTypeWin32);
+  error.SetError(::WSAGetLastError(), lldb::eErrorTypeWin32);
 #else
-    error.SetErrorToErrno();
+  error.SetErrorToErrno();
 #endif
 }
 
-NativeSocket
-Socket::CreateSocket(const int domain,
-                     const int type,
-                     const int protocol,
-                     bool child_processes_inherit,
-                     Error& error)
-{
-    error.Clear();
-    auto socketType = type;
+NativeSocket Socket::CreateSocket(const int domain, const int type,
+                                  const int protocol,
+                                  bool child_processes_inherit, Error &error) {
+  error.Clear();
+  auto socketType = type;
 #ifdef SOCK_CLOEXEC
-    if (!child_processes_inherit)
-        socketType |= SOCK_CLOEXEC;
+  if (!child_processes_inherit)
+    socketType |= SOCK_CLOEXEC;
 #endif
-    auto sock = ::socket (domain, socketType, protocol);
-    if (sock == kInvalidSocketValue)
-        SetLastError(error);
+  auto sock = ::socket(domain, socketType, protocol);
+  if (sock == kInvalidSocketValue)
+    SetLastError(error);
 
-    return sock;
+  return sock;
 }
 
-NativeSocket
-Socket::AcceptSocket(NativeSocket sockfd,
-                     struct sockaddr *addr,
-                     socklen_t *addrlen,
-                     bool child_processes_inherit,
-                     Error& error)
-{
-    error.Clear();
+NativeSocket Socket::AcceptSocket(NativeSocket sockfd, struct sockaddr *addr,
+                                  socklen_t *addrlen,
+                                  bool child_processes_inherit, Error &error) {
+  error.Clear();
 #if defined(ANDROID_ARM_BUILD_STATIC) || defined(ANDROID_MIPS_BUILD_STATIC)
-    // Temporary workaround for statically linking Android lldb-server with the
-    // latest API.
-    int fd = syscall(__NR_accept, sockfd, addr, addrlen);
-    if (fd >= 0 && !child_processes_inherit)
-    {
-        int flags = ::fcntl(fd, F_GETFD);
-        if (flags != -1 && ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != -1)
-            return fd;
-        SetLastError(error);
-        close(fd);
-    }
-    return fd;
+  // Temporary workaround for statically linking Android lldb-server with the
+  // latest API.
+  int fd = syscall(__NR_accept, sockfd, addr, addrlen);
+  if (fd >= 0 && !child_processes_inherit) {
+    int flags = ::fcntl(fd, F_GETFD);
+    if (flags != -1 && ::fcntl(fd, F_SETFD, flags | FD_CLOEXEC) != -1)
+      return fd;
+    SetLastError(error);
+    close(fd);
+  }
+  return fd;
 #elif defined(SOCK_CLOEXEC)
-    int flags = 0;
-    if (!child_processes_inherit) {
-        flags |= SOCK_CLOEXEC;
-    }
+  int flags = 0;
+  if (!child_processes_inherit) {
+    flags |= SOCK_CLOEXEC;
+  }
 #if defined(__NetBSD__)
-    NativeSocket fd = ::paccept (sockfd, addr, addrlen, nullptr, flags);
+  NativeSocket fd = ::paccept(sockfd, addr, addrlen, nullptr, flags);
 #else
-    NativeSocket fd = ::accept4 (sockfd, addr, addrlen, flags);
+  NativeSocket fd = ::accept4(sockfd, addr, addrlen, flags);
 #endif
 #else
-    NativeSocket fd = ::accept (sockfd, addr, addrlen);
+  NativeSocket fd = ::accept(sockfd, addr, addrlen);
 #endif
-    if (fd == kInvalidSocketValue)
-        SetLastError(error);
-    return fd;
+  if (fd == kInvalidSocketValue)
+    SetLastError(error);
+  return fd;
 }