1 files changed, 13 insertions, 9 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index e831fd48f5..1f59ccbef2 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -679,6 +679,8 @@ bool Codegen::visit(ArrayMemberExpression *ast)
         return false;
     }
     Reference index = expression(ast->expression);
+    if (hasError)
+        return false;
     _expr.setResult(Reference::fromSubscript(base, index));
     return false;
 }
@@ -2204,15 +2206,17 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
         bytecodeGenerator->addInstruction(Instruction::Ret());
     }
 
-    bytecodeGenerator->finalize(_context);
-    _context->registerCount = bytecodeGenerator->registerCount();
-    static const bool showCode = qEnvironmentVariableIsSet("QV4_SHOW_BYTECODE");
-    if (showCode) {
-        qDebug() << "=== Bytecode for" << _context->name << "strict mode" << _context->isStrict
-                 << "register count" << _context->registerCount;
-        QV4::Moth::dumpBytecode(_context->code, _context->locals.size(), _context->arguments.size(),
-                                _context->line, _context->lineNumberMapping);
-        qDebug();
+    if (!hasError) {
+        bytecodeGenerator->finalize(_context);
+        _context->registerCount = bytecodeGenerator->registerCount();
+        static const bool showCode = qEnvironmentVariableIsSet("QV4_SHOW_BYTECODE");
+        if (showCode) {
+            qDebug() << "=== Bytecode for" << _context->name << "strict mode" << _context->isStrict
+                     << "register count" << _context->registerCount;
+            QV4::Moth::dumpBytecode(_context->code, _context->locals.size(), _context->arguments.size(),
+                                    _context->line, _context->lineNumberMapping);
+            qDebug();
+        }
     }
 
     qSwap(_returnAddress, returnAddress);