Remove the "bool" return from OptionValue::Clear and its subclasses.

lldb/include/lldb/Interpreter/OptionValue.h

@@ -85,7 +85,7 @@ class OptionValue {
   SetValueFromString(llvm::StringRef value,
                      VarSetOperationType op = eVarSetOperationAssign);
 
-  virtual bool Clear() = 0;
+  virtual void Clear() = 0;
 
   virtual lldb::OptionValueSP DeepCopy() const = 0;
 

lldb/include/lldb/Interpreter/OptionValueArch.h

@@ -47,10 +47,9 @@ class OptionValueArch : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueArray.h

@@ -36,10 +36,9 @@ class OptionValueArray : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_values.clear();
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueBoolean.h

@@ -37,10 +37,9 @@ class OptionValueBoolean : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   void AutoComplete(CommandInterpreter &interpreter,

lldb/include/lldb/Interpreter/OptionValueChar.h

@@ -38,10 +38,9 @@ class OptionValueChar : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   // Subclass specific functions

lldb/include/lldb/Interpreter/OptionValueDictionary.h

@@ -35,10 +35,9 @@ class OptionValueDictionary : public OptionValue {
   SetValueFromString(llvm::StringRef value,
                      VarSetOperationType op = eVarSetOperationAssign) override;
 
-  bool Clear() override {
+  void Clear() override {
     m_values.clear();
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueEnumeration.h

@@ -47,10 +47,9 @@ class OptionValueEnumeration : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueFileColonLine.h

@@ -35,10 +35,10 @@ class OptionValueFileColonLine : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_file_spec.Clear();
     m_line_number = LLDB_INVALID_LINE_NUMBER;
-    m_column_number = 0;
+    m_column_number = LLDB_INVALID_COLUMN_NUMBER;
   }
 
   lldb::OptionValueSP DeepCopy() const override;
@@ -49,7 +49,7 @@ class OptionValueFileColonLine : public OptionValue {
   FileSpec &GetFileSpec() { return m_file_spec; }
   uint32_t GetLineNumber() { return m_line_number; }
   uint32_t GetColumnNumber() { return m_column_number; }
-  
+
   void SetCompletionMask(uint32_t mask) { m_completion_mask = mask; }
 
 protected:

lldb/include/lldb/Interpreter/OptionValueFileSpec.h

@@ -41,12 +41,11 @@ class OptionValueFileSpec : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
     m_data_sp.reset();
     m_data_mod_time = llvm::sys::TimePoint<>();
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueFileSpecList.h

@@ -39,11 +39,10 @@ class OptionValueFileSpecList : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     std::lock_guard<std::recursive_mutex> lock(m_mutex);
     m_current_value.Clear();
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueFormat.h

@@ -38,10 +38,9 @@ class OptionValueFormat : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueFormatEntity.h

@@ -34,7 +34,7 @@ class OptionValueFormatEntity : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override;
+  void Clear() override;
 
   lldb::OptionValueSP DeepCopy() const override;
 

lldb/include/lldb/Interpreter/OptionValueLanguage.h

@@ -41,10 +41,9 @@ class OptionValueLanguage : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValuePathMappings.h

@@ -35,10 +35,9 @@ class OptionValuePathMappings : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_path_mappings.Clear(m_notify_changes);
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueProperties.h

@@ -34,7 +34,7 @@ class OptionValueProperties
 
   Type GetType() const override { return eTypeProperties; }
 
-  bool Clear() override;
+  void Clear() override;
 
   lldb::OptionValueSP DeepCopy() const override;
 

lldb/include/lldb/Interpreter/OptionValueRegex.h

@@ -36,10 +36,9 @@ class OptionValueRegex : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_regex = RegularExpression(m_default_regex_str);
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueSInt64.h

@@ -50,10 +50,9 @@ class OptionValueSInt64 : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueString.h

@@ -85,10 +85,9 @@ class OptionValueString : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueUInt64.h

@@ -47,10 +47,9 @@ class OptionValueUInt64 : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_current_value = m_default_value;
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/include/lldb/Interpreter/OptionValueUUID.h

@@ -36,10 +36,9 @@ class OptionValueUUID : public OptionValue {
   SetValueFromString(const char *,
                      VarSetOperationType = eVarSetOperationAssign) = delete;
 
-  bool Clear() override {
+  void Clear() override {
     m_uuid.Clear();
     m_value_was_set = false;
-    return true;
   }
 
   lldb::OptionValueSP DeepCopy() const override;

lldb/source/Interpreter/OptionValueFormatEntity.cpp

@@ -29,11 +29,10 @@ OptionValueFormatEntity::OptionValueFormatEntity(const char *default_format)
   }
 }
 
-bool OptionValueFormatEntity::Clear() {
+void OptionValueFormatEntity::Clear() {
   m_current_entry = m_default_entry;
   m_current_format = m_default_format;
   m_value_was_set = false;
-  return true;
 }
 
 static void EscapeBackticks(llvm::StringRef str, std::string &dst) {

lldb/source/Interpreter/OptionValueProperties.cpp

@@ -517,11 +517,10 @@ bool OptionValueProperties::SetPropertyAtIndexAsUInt64(
   return false;
 }
 
-bool OptionValueProperties::Clear() {
+void OptionValueProperties::Clear() {
   const size_t num_properties = m_properties.size();
   for (size_t i = 0; i < num_properties; ++i)
     m_properties[i].GetValue()->Clear();
-  return true;
 }
 
 Status OptionValueProperties::SetValueFromString(llvm::StringRef value,