Update LLDB snapshot to upstream r216948 (git 50f7fe44)

This is approximately "LLDB 3.5" although with a little bit of skew,
and will go along with the Clang 3.5 import.

Sponsored by:	DARPA, AFRL

1 files changed, 3 insertions, 2 deletions

diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp
index 6471943..bf153a1 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueBoolean.cpp
@@ -16,6 +16,7 @@
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StringList.h"
 #include "lldb/Interpreter/Args.h"
+#include "llvm/ADT/STLExtras.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -58,7 +59,7 @@ OptionValueBoolean::SetValueFromCString (const char *value_cstr,
             }
             else
             {
-                if (value_cstr == NULL)
+                if (value_cstr == nullptr)
                     error.SetErrorString ("invalid boolean string value: NULL");
                 else if (value_cstr[0] == '\0')
                     error.SetErrorString ("invalid boolean string value <empty>");
@@ -110,7 +111,7 @@ OptionValueBoolean::AutoComplete (CommandInterpreter &interpreter,
         { "1"    , 1 },
         { "0"    , 1 },
     };
-    const size_t k_num_autocomplete_entries = sizeof(g_autocomplete_entries)/sizeof(StringEntry);
+    const size_t k_num_autocomplete_entries = llvm::array_lengthof(g_autocomplete_entries);
     
     if (s && s[0])
     {