Retrieve detailed location information when profiling signal handlers

Use the Functions associated with signal handlers to find out
which exact code is being executed.

Task-number: QTCREATORBUG-11100
Change-Id: Idfae9d188b17977b55f551e6fe766042fe24e786
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

3 files changed, 27 insertions, 4 deletions

diff --git a/src/qml/debugger/qqmlprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h
index 86807eacec..32b88e3ec3 100644
--- a/src/qml/debugger/qqmlprofilerservice_p.h
+++ b/src/qml/debugger/qqmlprofilerservice_p.h
@@ -55,6 +55,7 @@
 
 #include <private/qqmldebugservice_p.h>
 #include <private/qqmlboundsignal_p.h>
+#include <private/qv4function_p.h>
 
 #include <QtCore/qelapsedtimer.h>
 #include <QtCore/qmetaobject.h>
@@ -254,10 +255,20 @@ struct QQmlHandlingSignalProfiler {
     QQmlHandlingSignalProfiler(QQmlBoundSignalExpression *expression)
     {
         if (QQmlProfilerService::enabled) {
-            QQmlProfilerService::instance->startRange(QQmlProfilerService::HandlingSignal);
-            QQmlProfilerService::instance->rangeLocation(QQmlProfilerService::HandlingSignal,
-                                   expression->sourceFile(), expression->lineNumber(),
-                                   expression->columnNumber());
+            QQmlProfilerService *service = QQmlProfilerService::instance;
+            service->startRange(QQmlProfilerService::HandlingSignal);
+            if (expression->sourceFile().isEmpty()) {
+                QV4::Function *function = expression->function();
+                if (function) {
+                    service->rangeLocation(QQmlProfilerService::HandlingSignal,
+                            function->sourceFile(), function->compiledFunction->location.line,
+                            function->compiledFunction->location.column);
+                }
+            } else {
+                service->rangeLocation(QQmlProfilerService::HandlingSignal,
+                        expression->sourceFile(), expression->lineNumber(),
+                        expression->columnNumber());
+            }
         }
     }
 
diff --git a/src/qml/qml/qqmlboundsignal.cpp b/src/qml/qml/qqmlboundsignal.cpp
index 68160edf5e..bc56fe1f2d 100644
--- a/src/qml/qml/qqmlboundsignal.cpp
+++ b/src/qml/qml/qqmlboundsignal.cpp
@@ -136,6 +136,17 @@ QString QQmlBoundSignalExpression::expression() const
     }
 }
 
+QV4::Function *QQmlBoundSignalExpression::function() const
+{
+    if (m_expressionFunctionValid) {
+        Q_ASSERT (context() && engine());
+        QV4::Scope scope(QQmlEnginePrivate::get(engine())->v4engine());
+        QV4::Scoped<QV4::FunctionObject> v(scope, m_v8function.value());
+        return v ? v->function : 0;
+    }
+    return 0;
+}
+
 // Parts of this function mirror code in QQmlExpressionPrivate::value() and v8value().
 // Changes made here may need to be made there and vice versa.
 void QQmlBoundSignalExpression::evaluate(void **a)
diff --git a/src/qml/qml/qqmlboundsignal_p.h b/src/qml/qml/qqmlboundsignal_p.h
index feb79d5484..fe0dbd380e 100644
--- a/src/qml/qml/qqmlboundsignal_p.h
+++ b/src/qml/qml/qqmlboundsignal_p.h
@@ -90,6 +90,7 @@ public:
     quint16 lineNumber() const { return m_line; }
     quint16 columnNumber() const { return m_column; }
     QString expression() const;
+    QV4::Function *function() const;
     QObject *target() const { return m_target; }
 
     QQmlEngine *engine() const { return context() ? context()->engine : 0; }