summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2012-06-26 16:26:34 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-04 15:11:17 +0200
commit9b632047874f6cc9f23520d2fcdb566bed230a97 (patch)
tree064aadc16b2baa956fd14b179989f2323895d348
parent3c17d2eb819ea80229746d17404e49717b90c657 (diff)
downloadqtjsbackend-9b632047874f6cc9f23520d2fcdb566bed230a97.tar.gz
[V8] Fix assertions in mjsunit/harmony test in debug mode
This fix adds numeric field for QMLContextLocalCount in ScopeInfo which is needed for the correct kVariablePartIndex value. This change should be squashed into the "V8 Introduce a QML compilation mode" commit (2df5be48c08803b6bafafe9c69959a4076022293) in the next V8 rebase. Change-Id: Id04a593e0626908371c4c69304eb26dd4ff11f20 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
-rw-r--r--src/3rdparty/v8/src/objects.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/v8/src/objects.h b/src/3rdparty/v8/src/objects.h
index 3772706..59458da 100644
--- a/src/3rdparty/v8/src/objects.h
+++ b/src/3rdparty/v8/src/objects.h
@@ -3453,11 +3453,14 @@ class ScopeInfo : public FixedArray {
// 3. The number of non-parameter variables allocated on the stack.
// 4. The number of non-parameter and parameter variables allocated in the
// context.
+ // 5. The number of non-parameter and parameter variables allocated in the
+ // QML context. (technically placeholder)
#define FOR_EACH_NUMERIC_FIELD(V) \
V(Flags) \
V(ParameterCount) \
V(StackLocalCount) \
- V(ContextLocalCount)
+ V(ContextLocalCount) \
+ V(QmlContextLocalCount)
#define FIELD_ACCESSORS(name) \
void Set##name(int value) { \