Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	src/qml/jsruntime/qv4value_p.h
	src/qml/qml/qqmlmetatype.cpp
	src/qml/qml/qqmltypewrapper.cpp
	src/quick/items/qquicktableview.cpp

Change-Id: I684f8e01a711580512848bf1253f39b39fcbf4c7

2 files changed, 18 insertions, 6 deletions

diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp
index b7e3e20fd0..04e6efb1e9 100644
--- a/src/qml/compiler/qv4codegen.cpp
+++ b/src/qml/compiler/qv4codegen.cpp
@@ -1073,6 +1073,7 @@ bool Codegen::visit(Expression *ast)
     TailCallBlocker blockTailCalls(this);
     statement(ast->left);
     blockTailCalls.unblock();
+    clearExprResultName(); // The name only holds for the left part
     accept(ast->right);
     return false;
 }
@@ -2537,7 +2538,7 @@ bool Codegen::visit(ObjectPattern *ast)
 
         {
             RegisterScope innerScope(this);
-            Reference value = expression(p->initializer);
+            Reference value = expression(p->initializer, name);
             if (hasError)
                 return false;
             value.loadInAccumulator();
@@ -2979,7 +2980,7 @@ int Codegen::defineFunction(const QString &name, AST::Node *ast,
         // already defined
         return leaveContext();
 
-    _context->name = name;
+    _context->name = name.isEmpty() ? currentExpr().result().name : name;
     _module->functions.append(_context);
     _context->functionIndex = _module->functions.count() - 1;
 
diff --git a/src/qml/compiler/qv4codegen_p.h b/src/qml/compiler/qv4codegen_p.h
index 6d5f8c0951..65dc4b97b5 100644
--- a/src/qml/compiler/qv4codegen_p.h
+++ b/src/qml/compiler/qv4codegen_p.h
@@ -199,8 +199,9 @@ public:
             codegen = cg;
         }
 
-        Reference() :
+        Reference(const QString &name = QString()) :
             constant(0),
+            name(name),
             isArgOrEval(false),
             isReadonly(false),
             isReferenceToConst(false),
@@ -418,6 +419,11 @@ protected:
         bool _trueBlockFollowsCondition = false;
 
     public:
+        explicit Result(const QString &name)
+            : _result(name)
+            , _requested(ex)
+        {}
+
         explicit Result(const Reference &lrvalue)
             : _result(lrvalue)
             , _requested(ex)
@@ -476,6 +482,10 @@ protected:
         void setResult(Reference &&result) {
             _result = std::move(result);
         }
+
+        void clearResultName() {
+            _result.name.clear();
+        }
     };
 
     void enterContext(AST::Node *node);
@@ -523,12 +533,12 @@ protected:
                    const BytecodeGenerator::Label *iffalse,
                    bool trueBlockFollowsCondition);
 
-    inline Reference expression(AST::ExpressionNode *ast)
+    inline Reference expression(AST::ExpressionNode *ast, const QString &name = QString())
     {
         if (!ast || hasError)
             return Reference();
 
-        pushExpr();
+        pushExpr(name);
         ast->accept(this);
         return popResult();
     }
@@ -716,6 +726,7 @@ protected:
     inline void setExprResult(const Reference &result) { m_expressions.back().setResult(result); }
     inline void setExprResult(Reference &&result) { m_expressions.back().setResult(std::move(result)); }
     inline Reference exprResult() const { return m_expressions.back().result(); }
+    inline void clearExprResultName() { m_expressions.back().clearResultName(); }
 
     inline bool exprAccept(Format f) { return m_expressions.back().accept(f); }
 
@@ -723,7 +734,7 @@ protected:
 
     inline void pushExpr(Result &&expr) { m_expressions.push_back(std::move(expr)); }
     inline void pushExpr(const Result &expr) { m_expressions.push_back(expr); }
-    inline void pushExpr() { m_expressions.emplace_back(); }
+    inline void pushExpr(const QString &name = QString()) { m_expressions.emplace_back(name); }
 
     inline Result popExpr()
     {