aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4runtime.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-10-13 22:08:59 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-14 21:59:56 +0200
commit668eca2b9343cf5d79dc1faa6c251595e2e84918 (patch)
treebae99ec4065b0e20ba3bbf2fab89434d43d12f07 /src/qml/jsruntime/qv4runtime.cpp
parent669e6b434f015982d2e5e9f48ef72d8e8eebb0ac (diff)
Avoid creating array attributes if possible
Holes in arrays should be represented by an empty value, not by creating/setting array attributes. Reason is that the creation is irreversable, and slows down execution. This speeds up crypto.js by 10% Change-Id: I2e5472575479a5f2dbe53f59ecb8ed3aeab1be7a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4runtime.cpp')
-rw-r--r--src/qml/jsruntime/qv4runtime.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 6b3afcc300..6f914fa3c2 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -500,7 +500,8 @@ ReturnedValue __qmljs_get_element(ExecutionContext *ctx, const ValueRef object,
uint pidx = o->propertyIndexFromArrayIndex(idx);
if (pidx < UINT_MAX) {
if (!o->arrayAttributes || o->arrayAttributes[pidx].isData()) {
- return o->arrayData[pidx].value.asReturnedValue();
+ if (!o->arrayData[pidx].value.isEmpty())
+ return o->arrayData[pidx].value.asReturnedValue();
}
}
@@ -996,13 +997,7 @@ ReturnedValue __qmljs_builtin_define_array(ExecutionContext *ctx, Value *values,
a->arrayDataLen = length;
Property *pd = a->arrayData;
for (uint i = 0; i < length; ++i) {
- if (values[i].isEmpty()) {
- a->ensureArrayAttributes();
- pd->value = Primitive::undefinedValue();
- a->arrayAttributes[i].clear();
- } else {
- pd->value = values[i];
- }
+ pd->value = values[i];
++pd;
}
a->setArrayLengthUnchecked(length);