V4 profiling: Don't needlessly resolve locations

Resolving locations is fairly expensive and we only need to do it once
per location.

Change-Id: I8716858f45da9c085e50527ada0611531641dafe
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

2 files changed, 19 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4profiling.cpp b/src/qml/jsruntime/qv4profiling.cpp
index a59190b846..72475c5416 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
@@ -95,12 +92,14 @@ void Profiler::reportData()
 {
     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();
+        FunctionLocation &location = locations[properties.constLast().id];
+        if (!location.isValid())
+            location = call.resolveLocation();
     }
 
     emit dataReady(locations, properties, m_memory_data);
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h
index 0b4193204f..bb128b7cf3 100644
--- a/src/qml/jsruntime/qv4profiling_p.h
+++ b/src/qml/jsruntime/qv4profiling_p.h
@@ -81,13 +81,23 @@ struct FunctionCallProperties {
 };
 
 struct FunctionLocation {
+    FunctionLocation(const QString &name = QString(), const QString &file = QString(),
+                     int line = -1, int column = -1) :
+        name(name), file(file), line(line), column(column)
+    {}
+
+    bool isValid()
+    {
+        return !name.isEmpty();
+    }
+
     QString name;
     QString file;
     int line;
     int column;
 };
 
-typedef QHash<qint64, QV4::Profiling::FunctionLocation> FunctionLocationHash;
+typedef QHash<quintptr, QV4::Profiling::FunctionLocation> FunctionLocationHash;
 
 struct MemoryAllocationProperties {
     qint64 timestamp;