[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, 12 insertions, 1 deletions

diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index 0802358d93..0f10b0fed7 100644
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -1098,9 +1098,20 @@ void JSCodeGen::generateJSCodeForFunctionsAndBindings(const QString &fileName, P
         else
             name = QStringLiteral("%qml-expression-entry");
 
+        AST::SourceElements *body;
+        if (function)
+            body = function->body ? function->body->elements : 0;
+        else {
+            // Synthesize source elements.
+            QQmlJS::MemoryPool *pool = output->jsParserEngine.pool();
+            AST::SourceElement *element = new (pool) AST::StatementSourceElement(static_cast<AST::Statement*>(node));
+            body = new (output->jsParserEngine.pool()) AST::SourceElements(element);
+            body = body->finish();
+        }
+
         defineFunction(name, node,
                        function ? function->formals : 0,
-                       function ? function->body->elements : node, function ? FunctionCode : QmlBinding);
+                       body, function ? FunctionCode : QmlBinding);
 
     }