1 files changed, 17 insertions, 11 deletions

diff --git a/src/qml/jsruntime/qv4profiling.cpp b/src/qml/jsruntime/qv4profiling.cpp
index a59190b846..349ec48e06 100644
--- a/src/qml/jsruntime/qv4profiling.cpp
+++ b/src/qml/jsruntime/qv4profiling.cpp
@@ -48,13 +48,10 @@ namespace Profiling {
 
 FunctionLocation FunctionCall::resolveLocation() const
 {
-    FunctionLocation location = {
-        m_function->name()->toQString(),
-        m_function->compilationUnit->fileName(),
-        m_function->compiledFunction->location.line,
-        m_function->compiledFunction->location.column
-    };
-    return location;
+    return FunctionLocation(m_function->name()->toQString(),
+                            m_function->compilationUnit->fileName(),
+                            m_function->compiledFunction->location.line,
+                            m_function->compiledFunction->location.column);
 }
 
 FunctionCallProperties FunctionCall::properties() const
@@ -81,7 +78,8 @@ Profiler::Profiler(QV4::ExecutionEngine *engine) : featuresEnabled(0), m_engine(
 void Profiler::stopProfiling()
 {
     featuresEnabled = 0;
-    reportData();
+    reportData(true);
+    m_sentLocations.clear();
 }
 
 bool operator<(const FunctionCall &call1, const FunctionCall &call2)
@@ -91,16 +89,24 @@ bool operator<(const FunctionCall &call1, const FunctionCall &call2)
             (call1.m_end == call2.m_end && call1.m_function < call2.m_function)));
 }
 
-void Profiler::reportData()
+void Profiler::reportData(bool trackLocations)
 {
     std::sort(m_data.begin(), m_data.end());
     QVector<FunctionCallProperties> properties;
-    QHash<qint64, FunctionLocation> locations;
+    FunctionLocationHash locations;
     properties.reserve(m_data.size());
 
     foreach (const FunctionCall &call, m_data) {
         properties.append(call.properties());
-        locations[properties.constLast().id] = call.resolveLocation();
+        Function *function = call.function();
+        SentMarker &marker = m_sentLocations[reinterpret_cast<quintptr>(function)];
+        if (!trackLocations || !marker.isValid()) {
+            FunctionLocation &location = locations[properties.constLast().id];
+            if (!location.isValid())
+                location = call.resolveLocation();
+            if (trackLocations)
+                marker.setFunction(function);
+        }
     }
 
     emit dataReady(locations, properties, m_memory_data);