Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake

Change-Id: I2963c1209316fb6755f572969f368970450d7991

1 files changed, 7 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4runtimecodegen.cpp b/src/qml/jsruntime/qv4runtimecodegen.cpp
index 99d0de5ec6..8d324acbd0 100644
--- a/src/qml/jsruntime/qv4runtimecodegen.cpp
+++ b/src/qml/jsruntime/qv4runtimecodegen.cpp
@@ -59,7 +59,7 @@ void RuntimeCodegen::generateFromFunctionExpression(const QString &fileName,
     scan(ast);
     scan.leaveEnvironment();
 
-    if (hasError)
+    if (hasError())
         return;
 
     int index = defineFunction(ast->name.toString(), ast, ast->formals, ast->body);
@@ -68,17 +68,19 @@ void RuntimeCodegen::generateFromFunctionExpression(const QString &fileName,
 
 void RuntimeCodegen::throwSyntaxError(const AST::SourceLocation &loc, const QString &detail)
 {
-    if (hasError)
+    if (hasError())
         return;
-    hasError = true;
+
+    Codegen::throwSyntaxError(loc, detail);
     engine->throwSyntaxError(detail, _module->fileName, loc.startLine, loc.startColumn);
 }
 
 void RuntimeCodegen::throwReferenceError(const AST::SourceLocation &loc, const QString &detail)
 {
-    if (hasError)
+    if (hasError())
         return;
-    hasError = true;
+
+    Codegen::throwReferenceError(loc, detail);
     engine->throwReferenceError(detail, _module->fileName, loc.startLine, loc.startColumn);
 }