[new compiler] Fix crash with empty function bodies

Change defineFunction back to taking AST::SourceElements for the body (how it
was originally)

Then in the new compiler, do the same "function->body ? function->body->elements
: 0" dance for function expressions and for binding expressions, synthesize the
AST::SourceElements.

Change-Id: Iaedb15925a6bb8482cde2b371a6e781477252435
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index bd4b1f2c9d..303d001246 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -1746,7 +1746,7 @@ bool Codegen::visit(FunctionDeclaration * ast)
 
 V4IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast,
                                       AST::FormalParameterList *formals,
-                                      AST::Node *body, Mode mode,
+                                      AST::SourceElements *body, Mode mode,
                                       const QStringList &inheritedLocals)
 {
     qSwap(_mode, mode); // enter function code.
@@ -1852,13 +1852,7 @@ V4IR::Function *Codegen::defineFunction(const QString &name, AST::Node *ast,
                      ast->firstSourceLocation().startLine, ast->firstSourceLocation().startColumn), 0));
     }
 
-    if (AST::SourceElements *elements = AST::cast<AST::SourceElements*>(body))
-        sourceElements(elements);
-    else if (body) {
-        Q_ASSERT(_mode == QmlBinding);
-        _block->nextLocation = ast->firstSourceLocation();
-        accept(body);
-    }
+    sourceElements(body);
 
     _function->insertBasicBlock(_exitBlock);