wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout 36fa9b176a91 (bug 710516) for M1 bustage.

Browse Source
This commit is contained in:
Brian Hackett 2011-12-15 09:07:00 -08:00
parent 3a8434d343
commit ba149c3e2a
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/frontend/BytecodeEmitter.cpp
View File

@ -1781,8 +1781,8 @@ LookupCompileTimeConstant(JSContext *cx, BytecodeEmitter *bce, JSAtom *atom, Val
* from our variable object here.
*/
if (!shape->writable() && !shape->configurable() &&
shape->hasDefaultGetter() && shape->hasSlot()) {
*constp = obj->nativeGetSlot(shape->slot());
shape->hasDefaultGetter() && obj->containsSlot(shape->slot())) {
*constp = obj->getSlot(shape->slot());
}
}

9
js/src/jsdbgapi.cpp
View File

@ -861,6 +861,15 @@ JS_GetPropertyDesc(JSContext *cx, JSObject *obj, JSScopeProperty *sprop,
}
pd->alias = JSVAL_VOID;
if (obj->containsSlot(shape->slot())) {
for (Shape::Range r = obj->lastProperty()->all(); !r.empty(); r.popFront()) {
const Shape &aprop = r.front();
if (&aprop != shape && aprop.slot() == shape->slot()) {
pd->alias = IdToJsval(aprop.propid());
break;
}
}
}
return JS_TRUE;
}

22
js/src/jsobj.cpp
View File

@ -5028,7 +5028,7 @@ js_FindClassObject(JSContext *cx, JSObject *start, JSProtoKey protoKey,
Value v = UndefinedValue();
if (prop && pobj->isNative()) {
shape = (Shape *) prop;
if (shape->hasSlot()) {
if (pobj->containsSlot(shape->slot())) {
v = pobj->nativeGetSlot(shape->slot());
if (v.isPrimitive())
v.setUndefined();
@ -5285,7 +5285,7 @@ CallAddPropertyHook(JSContext *cx, Class *clasp, JSObject *obj, const Shape *sha
if (!CallJSPropertyOp(cx, clasp->addProperty, obj, shape->propid(), vp))
return false;
if (*vp != nominal) {
if (shape->hasSlot())
if (obj->containsSlot(shape->slot()))
obj->nativeSetSlotWithType(cx, shape, *vp);
}
}
@ -5415,7 +5415,7 @@ DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const Value &value,
}
/* Store valueCopy before calling addProperty, in case the latter GC's. */
if (shape->hasSlot())
if (shape->hasSlot() && obj->containsSlot(shape->slot()))
obj->nativeSetSlot(shape->slot(), valueCopy);
/* XXXbe called with lock held */
@ -5850,6 +5850,7 @@ js_NativeSet(JSContext *cx, JSObject *obj, const Shape *shape, bool added, bool
if (shape->hasSlot()) {
uint32 slot = shape->slot();
JS_ASSERT(obj->containsSlot(slot));
/* If shape has a stub setter, just store *vp. */
if (shape->hasDefaultSetter()) {
@ -6331,7 +6332,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
* Note that we store before calling addProperty, to match the order
* in DefineNativeProperty.
*/
if (shape->hasSlot())
if (obj->containsSlot(shape->slot()))
obj->nativeSetSlot(shape->slot(), UndefinedValue());
/* XXXbe called with obj locked */
@ -6463,7 +6464,7 @@ js_DeleteProperty(JSContext *cx, JSObject *obj, jsid id, Value *rval, JSBool str
if (rval->isFalse())
return true;
if (shape->hasSlot()) {
if (shape->hasSlot() && obj->containsSlot(shape->slot())) {
const Value &v = obj->nativeGetSlot(shape->slot());
GCPoke(cx, v);
@ -6516,6 +6517,7 @@ HasDataProperty(JSContext *cx, JSObject *obj, jsid methodid, Value *vp)
{
if (const Shape *shape = obj->nativeLookup(cx, methodid)) {
if (shape->hasDefaultGetterOrIsMethod() && shape->hasSlot()) {
JS_ASSERT(obj->containsSlot(shape->slot()));
*vp = obj->nativeGetSlot(shape->slot());
return true;
}
@ -6957,8 +6959,10 @@ js_PrintObjectSlotName(JSTracer *trc, char *buf, size_t bufsize)
const Shape *shape;
if (obj->isNative()) {
shape = obj->lastProperty();
while (shape && (!shape->hasSlot() || shape->slot() != slot))
while (shape->previous() && shape->maybeSlot() != slot)
shape = shape->previous();
if (shape->maybeSlot() != slot)
shape = NULL;
} else {
shape = NULL;
}
@ -7015,8 +7019,8 @@ js_ClearNative(JSContext *cx, JSObject *obj)
if (shape->isDataDescriptor() &&
shape->writable() &&
shape->hasDefaultSetter() &&
shape->hasSlot()) {
obj->nativeSetSlot(shape->slot(), UndefinedValue());
obj->containsSlot(shape->maybeSlot())) {
obj->setSlot(shape->slot(), UndefinedValue());
}
}
return true;
@ -7283,7 +7287,7 @@ DumpProperty(JSObject *obj, const Shape &shape)
uint32 slot = shape.hasSlot() ? shape.maybeSlot() : SHAPE_INVALID_SLOT;
fprintf(stderr, ": slot %d", slot);
if (shape.hasSlot()) {
if (obj->containsSlot(slot)) {
fprintf(stderr, " = ");
dumpValue(obj->getSlot(slot));
} else if (slot != SHAPE_INVALID_SLOT) {

2
js/src/jsobj.h
View File

@ -710,6 +710,8 @@ struct JSObject : js::gc::Cell
inline uint32 slotSpan() const;
inline bool containsSlot(uint32 slot) const;
void rollbackProperties(JSContext *cx, uint32 slotSpan);
#ifdef DEBUG

12
js/src/jsobjinlines.h
View File

@ -1141,11 +1141,17 @@ JSObject::slotSpan() const
return lastProperty()->slotSpan();
}
inline bool
JSObject::containsSlot(uint32 slot) const
{
return slot < slotSpan();
}
inline js::HeapValue &
JSObject::nativeGetSlotRef(uintN slot)
{
JS_ASSERT(isNative());
JS_ASSERT(slot < slotSpan());
JS_ASSERT(containsSlot(slot));
return getSlotRef(slot);
}
@ -1153,7 +1159,7 @@ inline const js::Value &
JSObject::nativeGetSlot(uintN slot) const
{
JS_ASSERT(isNative());
JS_ASSERT(slot < slotSpan());
JS_ASSERT(containsSlot(slot));
return getSlot(slot);
}
@ -1177,7 +1183,7 @@ inline void
JSObject::nativeSetSlot(uintN slot, const js::Value &value)
{
JS_ASSERT(isNative());
JS_ASSERT(slot < slotSpan());
JS_ASSERT(containsSlot(slot));
return setSlot(slot, value);
}