Merge pull request #6698 from adrian-prantl/107633615

Make diagnostics API safer to use

Author: adrian-prantl

lldb/include/lldb/Expression/DiagnosticManager.h

@@ -114,7 +114,8 @@ class DiagnosticManager {
   }
 
   void AddDiagnostic(std::unique_ptr<Diagnostic> diagnostic) {
-    m_diagnostics.push_back(std::move(diagnostic));
+    if (diagnostic)
+      m_diagnostics.push_back(std::move(diagnostic));
   }
 
   size_t Printf(DiagnosticSeverity severity, const char *format, ...)

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -2855,7 +2855,8 @@ class StoringDiagnosticConsumer : public swift::DiagnosticConsumer {
   }
 
   void AddDiagnostic(std::unique_ptr<Diagnostic> diagnostic) {
-    m_diagnostics.push_back(std::move(diagnostic));
+    if (diagnostic)
+      m_diagnostics.push_back(std::move(diagnostic));
   }
 
 private:

lldb/unittests/Expression/DiagnosticManagerTest.cpp

@@ -75,6 +75,9 @@ TEST(DiagnosticManagerTest, HasFixits) {
 TEST(DiagnosticManagerTest, GetStringNoDiags) {
   DiagnosticManager mgr;
   EXPECT_EQ("", mgr.GetString());
+  std::unique_ptr<Diagnostic> empty;
+  mgr.AddDiagnostic(std::move(empty));
+  EXPECT_EQ("", mgr.GetString());
 }
 
 TEST(DiagnosticManagerTest, GetStringBasic) {