qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Optimize lookup code 

Simplify code slightly and allow the compiler to
generate more efficient code.

Change-Id: I2fbb060dc8969cf17813157d9c15e088a61e5de4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Lars Knoll 2013-10-31 12:32:16 +01:00 committed by The Qt Project
parent f0ad3a5943
commit a02863c6ce
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/qml/jsruntime/qv4lookup.cpp
View File

@ -49,16 +49,6 @@ using namespace QV4;
Property *Lookup::lookup(Object *obj, PropertyAttributes *attrs)
{
int i = 0;
while (i < level && obj && obj->internalClass == classList[i]) {
obj = obj->prototype();
++i;
}
if (index != UINT_MAX && obj->internalClass == classList[i]) {
*attrs = obj->internalClass->propertyData.at(index);
return obj->memberData + index;
}
while (i < Size && obj) {
classList[i] = obj->internalClass;
@ -72,7 +62,7 @@ Property *Lookup::lookup(Object *obj, PropertyAttributes *attrs)
obj = obj->prototype();
++i;
}
level = i;
level = Size;
while (obj) {
index = obj->internalClass->find(name);
@ -140,9 +130,12 @@ ReturnedValue Lookup::getterGeneric(QV4::Lookup *l, const ValueRef object)
ReturnedValue Lookup::getter0(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass)
return o->memberData[l->index].value.asReturnedValue();
return static_cast<Object *>(o)->memberData[l->index].value.asReturnedValue();
}
l->getter = getterGeneric;
return getterGeneric(l, object);
@ -150,7 +143,10 @@ ReturnedValue Lookup::getter0(Lookup *l, const ValueRef object)
ReturnedValue Lookup::getter1(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass &&
l->classList[1] == o->prototype()->internalClass)
return o->prototype()->memberData[l->index].value.asReturnedValue();
@ -161,7 +157,10 @@ ReturnedValue Lookup::getter1(Lookup *l, const ValueRef object)
ReturnedValue Lookup::getter2(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass) {
o = o->prototype();
if (l->classList[1] == o->internalClass) {
@ -177,7 +176,10 @@ ReturnedValue Lookup::getter2(Lookup *l, const ValueRef object)
ReturnedValue Lookup::getterAccessor0(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass) {
Scope scope(o->engine());
FunctionObject *getter = o->memberData[l->index].getter();
@ -195,7 +197,10 @@ ReturnedValue Lookup::getterAccessor0(Lookup *l, const ValueRef object)
ReturnedValue Lookup::getterAccessor1(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass &&
l->classList[1] == o->prototype()->internalClass) {
Scope scope(o->engine());
@ -214,7 +219,10 @@ ReturnedValue Lookup::getterAccessor1(Lookup *l, const ValueRef object)
ReturnedValue Lookup::getterAccessor2(Lookup *l, const ValueRef object)
{
if (Object *o = object->asObject()) {
if (object->isManaged()) {
// we can safely cast to a QV4::Object here. If object is actually a string,
// the internal class won't match
Object *o = object->objectValue();
if (l->classList[0] == o->internalClass) {
o = o->prototype();
if (l->classList[1] == o->internalClass) {