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

Bug 882468 - Simplify BooleanGetPrimitiveValue. r=jwalden

Browse Source 
--HG--
extra : rebase_source : 0cda3f7ea8a717b3b7207e6b9f9aae0c369c3fb0
This commit is contained in:
Till Schneidereit 2013-06-18 23:51:47 +02:00
parent 4cc8004638
commit ee2cf40a62
7 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jsapi.h
View File

@ -2869,7 +2869,7 @@ struct JSClass {
* with the following flags. Failure to use JSCLASS_GLOBAL_FLAGS was
* prevously allowed, but is now an ES5 violation and thus unsupported.
*/
#define JSCLASS_GLOBAL_SLOT_COUNT (JSProto_LIMIT * 3 + 26)
#define JSCLASS_GLOBAL_SLOT_COUNT (JSProto_LIMIT * 3 + 25)
#define JSCLASS_GLOBAL_FLAGS_WITH_SLOTS(n) \
(JSCLASS_IS_GLOBAL | JSCLASS_HAS_RESERVED_SLOTS(JSCLASS_GLOBAL_SLOT_COUNT + (n)))
#define JSCLASS_GLOBAL_FLAGS \

22
js/src/jsbool.cpp
View File

@ -172,8 +172,6 @@ js_InitBooleanClass(JSContext *cx, HandleObject obj)
return NULL;
}
global->setBooleanValueOf(valueOf);
if (!DefineConstructorAndPrototype(cx, global, JSProto_Boolean, ctor, booleanProto))
return NULL;
@ -196,16 +194,16 @@ js::ToBooleanSlow(const Value &v)
return !EmulatesUndefined(&v.toObject());
}
/*
* This slow path is only ever taken for Boolean objects from other
* compartments. The only caller of the fast path, JSON's PreprocessValue,
* makes sure of that.
*/
bool
js::BooleanGetPrimitiveValueSlow(JSContext *cx, HandleObject obj, Value *vp)
js::BooleanGetPrimitiveValueSlow(HandleObject wrappedBool, JSContext *cx)
{
InvokeArgsGuard ag;
if (!cx->stack.pushInvokeArgs(cx, 0, &ag))
return false;
ag.setCallee(cx->compartment()->maybeGlobal()->booleanValueOf());
ag.setThis(ObjectValue(*obj));
if (!Invoke(cx, ag))
return false;
*vp = ag.rval();
return true;
JS_ASSERT(wrappedBool->isCrossCompartmentWrapper());
JSObject *obj = Wrapper::wrappedObject(wrappedBool);
JS_ASSERT(obj);
return obj->asBoolean().unbox();
}

2
js/src/jsbool.h
View File

@ -21,7 +21,7 @@ js_BooleanToString(JSContext *cx, JSBool b);
namespace js {
inline bool
inline void
BooleanGetPrimitiveValue(JSContext *cx, HandleObject obj, Value *vp);
} /* namespace js */

10
js/src/jsboolinlines.h
View File

@ -16,17 +16,15 @@
namespace js {
bool BooleanGetPrimitiveValueSlow(JSContext *, HandleObject, Value *);
bool BooleanGetPrimitiveValueSlow(HandleObject, JSContext *);
inline bool
inline void
BooleanGetPrimitiveValue(JSContext *cx, HandleObject obj, Value *vp)
{
if (obj->isBoolean()) {
if (obj->isBoolean())
*vp = BooleanValue(obj->asBoolean().unbox());
return true;
}
return BooleanGetPrimitiveValueSlow(cx, obj, vp);
vp->setBoolean(BooleanGetPrimitiveValueSlow(obj, cx));
}
inline bool

3
js/src/json.cpp
View File

@ -278,8 +278,7 @@ PreprocessValue(JSContext *cx, HandleObject holder, KeyType key, MutableHandleVa
return false;
vp.set(StringValue(str));
} else if (ObjectClassIs(obj, ESClass_Boolean, cx)) {
if (!BooleanGetPrimitiveValue(cx, obj, vp.address()))
return false;
BooleanGetPrimitiveValue(cx, obj, vp.address());
JS_ASSERT(vp.get().isBoolean());
}
}

7
js/src/vm/GlobalObject-inl.h
View File

@ -58,13 +58,6 @@ GlobalObject::setCreateArrayFromBufferHelper(uint32_t slot, Handle<JSFunction*>
setSlot(slot, ObjectValue(*fun));
}
void
GlobalObject::setBooleanValueOf(Handle<JSFunction*> valueOfFun)
{
JS_ASSERT(getSlotRef(BOOLEAN_VALUEOF).isUndefined());
setSlot(BOOLEAN_VALUEOF, ObjectValue(*valueOfFun));
}
void
GlobalObject::setCreateDataViewForThis(Handle<JSFunction*> fun)
{

9
js/src/vm/GlobalObject.h
View File

@ -66,8 +66,7 @@ class GlobalObject : public JSObject
static const unsigned STANDARD_CLASS_SLOTS = JSProto_LIMIT * 3;
/* Various function values needed by the engine. */
static const unsigned BOOLEAN_VALUEOF = STANDARD_CLASS_SLOTS;
static const unsigned EVAL = BOOLEAN_VALUEOF + 1;
static const unsigned EVAL = STANDARD_CLASS_SLOTS;
static const unsigned CREATE_DATAVIEW_FOR_THIS = EVAL + 1;
static const unsigned THROWTYPEERROR = CREATE_DATAVIEW_FOR_THIS + 1;
static const unsigned PROTO_GETTER = THROWTYPEERROR + 1;
@ -194,7 +193,6 @@ class GlobalObject : public JSObject
public:
/* XXX Privatize me! */
inline void setBooleanValueOf(Handle<JSFunction*> valueOfFun);
inline void setCreateDataViewForThis(Handle<JSFunction*> fun);
template<typename T>
@ -398,11 +396,6 @@ class GlobalObject : public JSObject
return &getSlot(THROWTYPEERROR).toObject();
}
Value booleanValueOf() const {
JS_ASSERT(booleanClassInitialized());
return getSlot(BOOLEAN_VALUEOF);
}
Value createDataViewForThis() const {
JS_ASSERT(dataViewClassInitialized());
return getSlot(CREATE_DATAVIEW_FOR_THIS);