From bf6ce59fd3b4800e603460bf23626d753b4d91f2 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Date: Mon, 20 Jul 2015 14:44:20 +0200
Subject: [PATCH] Clang: Fix occasional hang in ~SemanticHighlighter

A code path existed for which QFutureInterface<T>::reportFinished() was
not called.

Change-Id: I968c6b8cc92b9bfd49570405502da94bda8c7b56
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
---
 src/plugins/clangcodemodel/cppcreatemarkers.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/plugins/clangcodemodel/cppcreatemarkers.cpp b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
index 5a56b1e2fb2..a7518b355c3 100644
--- a/src/plugins/clangcodemodel/cppcreatemarkers.cpp
+++ b/src/plugins/clangcodemodel/cppcreatemarkers.cpp
@@ -32,6 +32,7 @@
 #include "cppcreatemarkers.h"
 
 #include <cplusplus/CppDocument.h>
+#include <utils/executeondestruction.h>
 #include <utils/runextensions.h>
 
 #include <QCoreApplication>
@@ -77,6 +78,9 @@ CreateMarkers::~CreateMarkers()
 void CreateMarkers::run()
 {
     QMutexLocker lock(m_marker->mutex());
+
+    ::Utils::ExecuteOnDestruction reportFinishedOnDestruction([this]() { reportFinished(); });
+
     if (isCanceled())
         return;
 
@@ -86,23 +90,18 @@ void CreateMarkers::run()
 
     m_usages.clear();
 
-    if (isCanceled()) {
-        reportFinished();
+    if (isCanceled())
         return;
-    }
 
     const QList<ClangCodeModel::SourceMarker> markers
         = m_marker->sourceMarkersInRange(m_firstLine, m_lastLine);
     foreach (const ClangCodeModel::SourceMarker &m, markers)
         addUse(SourceMarker(m.location().line(), m.location().column(), m.length(), m.kind()));
 
-    if (isCanceled()) {
-        reportFinished();
+    if (isCanceled())
         return;
-    }
 
     flush();
-    reportFinished();
 
     qCDebug(log) << "Creating markers took" << t.elapsed() << "ms in total.";
 }