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, 2 insertions, 1 deletions

diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
index 3d2a7ff..c8aaade 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
@@ -99,6 +99,7 @@ OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
 
             m_value_was_set = true;
             m_current_value.SetFile(filepath.c_str(), true);
+            m_data_sp.reset();
         }
         else
         {
@@ -139,7 +140,7 @@ OptionValueFileSpec::AutoComplete (CommandInterpreter &interpreter,
                                                          s,
                                                          match_start_point,
                                                          max_return_elements,
-                                                         NULL,
+                                                         nullptr,
                                                          word_complete,
                                                          matches);
     return matches.GetSize();