Fix error reporting when imports or re-exports in modules fail

Collect the location of the import/export statement and include it in
the exception thrown.

Change-Id: I7966dfd53ed67d2d7087acde2dd8ff67c64cb044
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

1 files changed, 9 insertions, 2 deletions

diff --git a/src/qml/compiler/qv4compileddata.cpp b/src/qml/compiler/qv4compileddata.cpp
index c82f3d1bc8..244e762faf 100644
--- a/src/qml/compiler/qv4compileddata.cpp
+++ b/src/qml/compiler/qv4compileddata.cpp
@@ -410,7 +410,7 @@ Heap::Module *CompilationUnit::instantiate(ExecutionEngine *engine)
         if (!valuePtr) {
             QString referenceErrorMessage = QStringLiteral("Unable to resolve import reference ");
             referenceErrorMessage += importName->toQString();
-            engine->throwReferenceError(referenceErrorMessage, fileName(), /*### line*/1, /*### column*/1);
+            engine->throwReferenceError(referenceErrorMessage, fileName(), entry.location.line, entry.location.column);
             return nullptr;
         }
         imports[i] = valuePtr;
@@ -426,7 +426,7 @@ Heap::Module *CompilationUnit::instantiate(ExecutionEngine *engine)
         if (!dependentModuleUnit->resolveExport(importName)) {
             QString referenceErrorMessage = QStringLiteral("Unable to resolve re-export reference ");
             referenceErrorMessage += importName->toQString();
-            engine->throwReferenceError(referenceErrorMessage, fileName(), /*### line*/1, /*### column*/1);
+            engine->throwReferenceError(referenceErrorMessage, fileName(), entry.location.line, entry.location.column);
             return nullptr;
         }
     }
@@ -949,6 +949,13 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString)
 #endif
 }
 
+Location &Location::operator=(const QQmlJS::AST::SourceLocation &astLocation)
+{
+    line = astLocation.startLine;
+    column = astLocation.startColumn;
+    return *this;
+}
+
 }
 
 }