Merge commit '03d1f3d7e34d' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/include/lldb/Expression/DiagnosticManager.h

@@ -107,7 +107,8 @@ class DiagnosticManager {
     m_fixed_expression.clear();
   }
 
-  const DiagnosticList &Diagnostics() { return m_diagnostics; }
+  const DiagnosticList &Diagnostics() const { return m_diagnostics; }
+  DiagnosticList &Diagnostics() { return m_diagnostics; }
 
   bool HasFixIts() const {
     return llvm::any_of(m_diagnostics,

lldb/include/lldb/Symbol/VariableList.h

@@ -24,6 +24,9 @@ class VariableList {
   VariableList();
   virtual ~VariableList();
 
+  VariableList(VariableList &&) = default;
+  VariableList &operator=(VariableList &&) = default;
+
   void AddVariable(const lldb::VariableSP &var_sp);
 
   bool AddVariableIfUnique(const lldb::VariableSP &var_sp);