When returning a struct like QV4::Value from a function, the compiler can
either place the return value into the stack by expecting the caller
to provide a hidden first argument (pointer to where to store the value)
or pass it in eax:edx. The choice of which approach to pick depends on
whether the type is known at function declaration time. In this case we
had a mismatch where qv4serialize.cpp had a function that returned a value
and it is implemented by calling another function that would return the value.
QV4::Value was forward-declared, and so when compiling the function, the
compiler would assume that the caller provided an invisible first argument
for return value storage. The caller (in qquickworkerscript.cpp) however
had fully visibility of QV4::Value at call time and therefore assumed that
the value is returned in eax:edx. This mismatch caused naturally all sorts
of funny crashes.
The approach chosen is to eliminate any forward declarations of QV4::Value
and instead include the definition where appropriate.
Change-Id: I33303d86964239d3be30d1096806c605cddb7bbc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
12 files changed:
QT_BEGIN_NAMESPACE
-namespace QV4 {
-struct Value;
-}
-
class QQmlContext;
class Q_QML_PRIVATE_EXPORT QQmlBinding : public QQmlJavaScriptExpression,
public QQmlAbstractExpression,
QT_BEGIN_NAMESPACE
-namespace QV4 {
- struct Value;
-}
-
namespace QQmlJS {
namespace Moth {
namespace QV4 {
-struct Value;
struct Object;
struct ExecutionEngine;
struct DeclarativeEnvironment;
namespace QV4 {
-struct Value;
struct Function;
struct Object;
struct BooleanObject;
#include <config.h>
#include <assembler/MacroAssemblerCodeRef.h>
+#include "qv4value_def_p.h"
QT_BEGIN_NAMESPACE
namespace QV4 {
-struct Value;
struct String;
struct Function;
struct Object;
namespace QV4 {
-struct Value;
struct Function;
struct Object;
struct BooleanObject;
struct ErrorObject;
struct ArgumentsObject;
struct Managed;
-struct Value;
struct Lookup;
struct ExecutionEngine;
struct QObjectWrapper;
namespace QV4 {
struct ExecutionContext;
-struct Value;
}
namespace QQmlJS {
namespace QV4 {
-struct Value;
struct Function;
struct Lookup;
struct Object;
struct PropertyAttributes;
struct ExecutionContext;
struct Property;
-struct Value;
struct String;
struct InternalClass;
//
#include <QtCore/qbytearray.h>
+#include <private/qv4value_p.h>
QT_BEGIN_NAMESPACE
class QV8Engine;
namespace QV4 {
-struct Value;
class Serialize {
public:
namespace QV4 {
struct ArrayObject;
struct ExecutionEngine;
- struct Value;
}
// Uncomment the following line to enable global handle debugging. When enabled, all the persistent
projects / platform / upstream / qtdeclarative.git / commitdiff