From: Chandler Carruth <chandlerc@gmail.com>
Date: Thu, 3 Nov 2016 18:03:14 +0000 (+0000)
Subject: Instead of resetting the pointer, or releasing it which was the previous
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1b760ebd6aaea8b930aa076a36db0768b80c1f2;p=clang

Instead of resetting the pointer, or releasing it which was the previous
code, let's just assert that the DiagonsticEngine doesn't own the client
because our constructor took ownership of it and has a std::unique_ptr
that handles deleting it. This seems much more clear -- the release was
harmless but confusing as if there were some memory there it would have
leaked, and the reset was harmless but confusing as if there were some
memory there it would have been double-freed. But in both cases there
was nothing there.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@285950 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Frontend/VerifyDiagnosticConsumer.cpp b/lib/Frontend/VerifyDiagnosticConsumer.cpp
index 57ea9a0f8b..ae16ea177f 100644
--- a/lib/Frontend/VerifyDiagnosticConsumer.cpp
+++ b/lib/Frontend/VerifyDiagnosticConsumer.cpp
@@ -43,7 +43,8 @@ VerifyDiagnosticConsumer::~VerifyDiagnosticConsumer() {
   assert(!CurrentPreprocessor && "CurrentPreprocessor should be invalid!");
   SrcManager = nullptr;
   CheckDiagnostics();
-  Diags.takeClient().reset();
+  assert(!Diags.ownsClient() &&
+         "The VerifyDiagnosticConsumer takes over ownership of the client!");
 }
 
 #ifndef NDEBUG