Attachment #508274 for bug #537873

Attachment #508274: Add a 'strict' argument to C++ property setter functions. for bug #537873

View | Details | Raw Unified | Return to bug 537873
Collapse All | Expand All

(-)a/js/src/jsapi-tests/testClassGetter.cpp (-4 / +4 lines)

Line	Link Here

Lines 29-38 static JSClass ptestClass = {	Link Here

    "PTest",

    "PTest",

    JSCLASS_HAS_PRIVATE,

    JSCLASS_HAS_PRIVATE,

    JS_PropertyStub, // add

    JS_PropertyStub,       // add

    JS_PropertyStub, // delete

    JS_PropertyStub,       // delete

    test_prop_get,   // get

    test_prop_get,         // get

    JS_PropertyStub, // set

    JS_StrictPropertyStub, // set

    JS_EnumerateStub,

    JS_EnumerateStub,

    JS_ResolveStub,

    JS_ResolveStub,

    JS_ConvertStub,

    JS_ConvertStub,

(-)a/js/src/jsapi-tests/testCustomIterator.cpp (-1 / +1 lines)

Line	Link Here

Lines 30-36 js::Class HasCustomIterClass = {	Link Here

    js::PropertyStub,

    js::PropertyStub,

    js::PropertyStub,

    js::PropertyStub,

    js::PropertyStub,

    js::PropertyStub,

    js::PropertyStub,

    js::StrictPropertyStub,

    js::EnumerateStub,

    js::EnumerateStub,

    js::ResolveStub,

    js::ResolveStub,

    js::ConvertStub,

    js::ConvertStub,

(-)a/js/src/jsapi-tests/testDefineGetterSetterNonEnumerable.cpp (-2 / +2 lines)

Line	Link Here

Lines 35-47 BEGIN_TEST(testDefineGetterSetterNonEnum	Link Here

    CHECK(JS_DefineProperty(cx, JSVAL_TO_OBJECT(vobj), PROPERTY_NAME,

    CHECK(JS_DefineProperty(cx, JSVAL_TO_OBJECT(vobj), PROPERTY_NAME,

                            JSVAL_VOID,

                            JSVAL_VOID,

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funGetObj),

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funGetObj),

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funSetObj),

                            JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, funSetObj),

                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_ENUMERATE));

                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_ENUMERATE));

    CHECK(JS_DefineProperty(cx, JSVAL_TO_OBJECT(vobj), PROPERTY_NAME,

    CHECK(JS_DefineProperty(cx, JSVAL_TO_OBJECT(vobj), PROPERTY_NAME,

                            JSVAL_VOID,

                            JSVAL_VOID,

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funGetObj),

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funGetObj),

                            JS_DATA_TO_FUNC_PTR(JSPropertyOp, funSetObj),

                            JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, funSetObj),

                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_PERMANENT));

                            JSPROP_GETTER | JSPROP_SETTER | JSPROP_PERMANENT));

    JSBool found = JS_FALSE;

    JSBool found = JS_FALSE;

(-)a/js/src/jsapi-tests/testExtendedEq.cpp (-4 / +4 lines)

Line	Link Here

Lines 18-27 my_Equality(JSContext cx, JSObject obj	Link Here

js::Class TestExtendedEq_JSClass = {

js::Class TestExtendedEq_JSClass = {

    "TestExtendedEq",

    "TestExtendedEq",

0,

0,

    js::PropertyStub, /* addProperty */

    js::PropertyStub,       /* addProperty */

    js::PropertyStub, /* delProperty */

    js::PropertyStub,       /* delProperty */

    js::PropertyStub, /* getProperty */

    js::PropertyStub,       /* getProperty */

    js::PropertyStub, /* setProperty */

    js::StrictPropertyStub, /* setProperty */

    JS_EnumerateStub,

    JS_EnumerateStub,

    JS_ResolveStub,

    JS_ResolveStub,

    NULL,           /* convert */

    NULL,           /* convert */

(-)a/js/src/jsapi-tests/testLookup.cpp (-1 / +1 lines)

Line	Link Here

Lines 56-62 document_resolve(JSContext *cx, JSObject	Link Here

static JSClass document_class = {

static JSClass document_class = {

    "document", JSCLASS_NEW_RESOLVE,

    "document", JSCLASS_NEW_RESOLVE,

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

    JS_EnumerateStub, (JSResolveOp) document_resolve, JS_ConvertStub, JS_FinalizeStub,

    JS_EnumerateStub, (JSResolveOp) document_resolve, JS_ConvertStub, JS_FinalizeStub,

    JSCLASS_NO_OPTIONAL_MEMBERS

    JSCLASS_NO_OPTIONAL_MEMBERS

};

};

(-)a/js/src/jsapi-tests/testNewObject.cpp (-1 / +1 lines)

Line	Link Here

Lines 84-90 BEGIN_TEST(testNewObject_1)	Link Here

    static JSClass cls = {

    static JSClass cls = {

        "testNewObject_1",

        "testNewObject_1",

0,

0,

        JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

        JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,

        JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, NULL,

        NULL, NULL, NULL, constructHook, NULL, NULL, NULL, NULL

        NULL, NULL, NULL, constructHook, NULL, NULL, NULL, NULL

};

};

(-)a/js/src/jsapi-tests/testOps.cpp (-1 / +1 lines)

Line	Link Here

Lines 17-23 my_convert(JSContext* context, JSObject*	Link Here

static JSClass myClass = {

static JSClass myClass = {

    "MyClass",

    "MyClass",

0,

0,

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

    JS_EnumerateStub, JS_ResolveStub, my_convert, JS_FinalizeStub,

    JS_EnumerateStub, JS_ResolveStub, my_convert, JS_FinalizeStub,

    JSCLASS_NO_OPTIONAL_MEMBERS

    JSCLASS_NO_OPTIONAL_MEMBERS

};

};

(-)a/js/src/jsapi-tests/testPropCache.cpp (-1 / +1 lines)

Line	Link Here

Lines 16-22 CounterAdd(JSContext cx, JSObject obj,	Link Here

static JSClass CounterClass = {

static JSClass CounterClass = {

    "Counter",  /* name */

    "Counter",  /* name */

    0,  /* flags */

    0,  /* flags */

    CounterAdd, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

    CounterAdd, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,

    JSCLASS_NO_OPTIONAL_MEMBERS

    JSCLASS_NO_OPTIONAL_MEMBERS

};

};

(-)a/js/src/jsapi-tests/testSetProperty.cpp (-2 / +2 lines)

Line	Link Here

Lines 20-30 BEGIN_TEST(testSetProperty_NativeGetterS	Link Here

    vobj = OBJECT_TO_JSVAL(obj);

    vobj = OBJECT_TO_JSVAL(obj);

    CHECK(JS_DefineProperty(cx, global, "globalProp", vobj,

    CHECK(JS_DefineProperty(cx, global, "globalProp", vobj,

                            JS_PropertyStub, JS_PropertyStub,

                            JS_PropertyStub, JS_StrictPropertyStub,

                            JSPROP_ENUMERATE));

                            JSPROP_ENUMERATE));

    CHECK(JS_DefineProperty(cx, obj, "prop", JSVAL_VOID,

    CHECK(JS_DefineProperty(cx, obj, "prop", JSVAL_VOID,

                            nativeGet, JS_PropertyStub,

                            nativeGet, JS_StrictPropertyStub,

                            JSPROP_SHARED));

                            JSPROP_SHARED));

    EXEC("'use strict';                                     \n"

    EXEC("'use strict';                                     \n"

(-)a/js/src/jsapi-tests/tests.h (-1 / +1 lines)

Line	Link Here

Lines 227-233 class JSAPITest	Link Here

227

    static JSClass * basicGlobalClass() {

227

    static JSClass * basicGlobalClass() {

228

        static JSClass c = {

228

        static JSClass c = {

229

            "global", JSCLASS_GLOBAL_FLAGS,

229

            "global", JSCLASS_GLOBAL_FLAGS,

230

            JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

230

            JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

231

            JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,

231

            JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,

232

            JSCLASS_NO_OPTIONAL_MEMBERS

232

            JSCLASS_NO_OPTIONAL_MEMBERS

233

};

233

};





    "jdummy",
    JSCLASS_GLOBAL_FLAGS,
    JS_PropertyStub,  JS_PropertyStub,
    JS_PropertyStub,  JS_StrictPropertyStub,
    JS_EnumerateStub, JS_ResolveStub,
    JS_ConvertStub,   NULL,
    JSCLASS_NO_OPTIONAL_MEMBERS

    /* Define a top-level property 'undefined' with the undefined value. */
    JSAtom *atom = cx->runtime->atomState.typeAtoms[JSTYPE_VOID];
    if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
                             PropertyStub, StrictPropertyStub,
                             JSPROP_PERMANENT | JSPROP_READONLY)) {
        return JS_FALSE;
    }

    if (idstr == ATOM_TO_STRING(atom)) {
        *resolved = JS_TRUE;
        return obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
                                   PropertyStub, StrictPropertyStub,
                                   JSPROP_PERMANENT | JSPROP_READONLY);
    }


    atom = rt->atomState.typeAtoms[JSTYPE_VOID];
    if (!obj->nativeContains(ATOM_TO_JSID(atom)) &&
        !obj->defineProperty(cx, ATOM_TO_JSID(atom), UndefinedValue(),
                             PropertyStub, StrictPropertyStub,
                             JSPROP_PERMANENT | JSPROP_READONLY)) {
        return JS_FALSE;
    }

}

JS_PUBLIC_API(JSBool)
JS_StrictPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    return JS_TRUE;
}

JS_PUBLIC_API(JSBool)
JS_EnumerateStub(JSContext *cx, JSObject *obj)
{
    return JS_TRUE;


static JSBool
DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, const Value &value,
                   PropertyOp getter, StrictPropertyOp setter, uintN attrs,
                   uintN flags, intN tinyid)
{
    CHECK_REQUEST(cx);


JS_PUBLIC_API(JSBool)
JS_DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value,
                      JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefinePropertyById(cx, obj, id, Valueify(value), Valueify(getter),
                              Valueify(setter), attrs, 0, 0);


JS_PUBLIC_API(JSBool)
JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,
                 JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefinePropertyById(cx, obj, INT_TO_JSID(index), Valueify(value),
                              Valueify(getter), Valueify(setter), attrs, 0, 0);


static JSBool
DefineProperty(JSContext *cx, JSObject *obj, const char *name, const Value &value,
               PropertyOp getter, StrictPropertyOp setter, uintN attrs,
               uintN flags, intN tinyid)
{
    jsid id;


JS_PUBLIC_API(JSBool)
JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,
                  JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefineProperty(cx, obj, name, Valueify(value), Valueify(getter),
                          Valueify(setter), attrs, 0, 0);


JS_PUBLIC_API(JSBool)
JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name, int8 tinyid,
                            jsval value, JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefineProperty(cx, obj, name, Valueify(value), Valueify(getter),
                          Valueify(setter), attrs, Shape::HAS_SHORTID, tinyid);


static JSBool
DefineUCProperty(JSContext *cx, JSObject *obj, const jschar *name, size_t namelen,
                 const Value &value, PropertyOp getter, StrictPropertyOp setter, uintN attrs,
                 uintN flags, intN tinyid)
{
    JSAtom *atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);


JS_PUBLIC_API(JSBool)
JS_DefineUCProperty(JSContext *cx, JSObject *obj, const jschar *name, size_t namelen,
                    jsval value, JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefineUCProperty(cx, obj, name, namelen, Valueify(value),
                            Valueify(getter), Valueify(setter), attrs, 0, 0);


JS_PUBLIC_API(JSBool)
JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj, const jschar *name, size_t namelen,
                              int8 tinyid, jsval value,
                              JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs)
{
    return DefineUCProperty(cx, obj, name, namelen, Valueify(value), Valueify(getter),
                            Valueify(setter), attrs, Shape::HAS_SHORTID, tinyid);

        desc->attrs = shape->attributes();

        if (shape->isMethod()) {
            desc->getter = PropertyStub;
            desc->setter = StrictPropertyStub;
            desc->value.setObject(shape->methodObject());
        } else {
            desc->getter = shape->getter();

JS_PUBLIC_API(JSBool)
JS_GetPropertyAttrsGetterAndSetterById(JSContext *cx, JSObject *obj, jsid id,
                                       uintN *attrsp, JSBool *foundp,
                                       JSPropertyOp *getterp, JSStrictPropertyOp *setterp)
{
    PropertyDescriptor desc;
    if (!GetPropertyDescriptorById(cx, obj, id, JSRESOLVE_QUALIFIED, JS_FALSE, &desc))

JS_PUBLIC_API(JSBool)
JS_GetPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj, const char *name,
                                   uintN *attrsp, JSBool *foundp,
                                   JSPropertyOp *getterp, JSStrictPropertyOp *setterp)
{
    JSAtom *atom = js_Atomize(cx, name, strlen(name), 0);
    return atom && JS_GetPropertyAttrsGetterAndSetterById(cx, obj, ATOM_TO_JSID(atom),

JS_GetUCPropertyAttrsGetterAndSetter(JSContext *cx, JSObject *obj,
                                     const jschar *name, size_t namelen,
                                     uintN *attrsp, JSBool *foundp,
                                     JSPropertyOp *getterp, JSStrictPropertyOp *setterp)
{
    JSAtom *atom = js_AtomizeChars(cx, name, AUTO_NAMELEN(name, namelen), 0);
    return atom && JS_GetPropertyAttrsGetterAndSetterById(cx, obj, ATOM_TO_JSID(atom),

    "PropertyIterator",
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(1) |
    JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,

(-)a/js/src/jsapi.h (-15 / +18 lines)

Line	Link Here

Lines 1878-1884 struct JSClass {	Link Here

1878

    JSPropertyOp        addProperty;

1878

    JSPropertyOp        addProperty;

1879

    JSPropertyOp        delProperty;

1879

    JSPropertyOp        delProperty;

1880

    JSPropertyOp        getProperty;

1880

    JSPropertyOp        getProperty;

1881

    JSPropertyOp        setProperty;

1881

    JSStrictPropertyOp  setProperty;

1882

    JSEnumerateOp       enumerate;

1882

    JSEnumerateOp       enumerate;

1883

    JSResolveOp         resolve;

1883

    JSResolveOp         resolve;

1884

    JSConvertOp         convert;

1884

    JSConvertOp         convert;

Lines 2003-2008 extern JS_PUBLIC_API(JSBool)	Link Here

2003

JS_PropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

2003

JS_PropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

2004

2005

extern JS_PUBLIC_API(JSBool)

2005

extern JS_PUBLIC_API(JSBool)

2006

JS_StrictPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool, jsval *vp);

2007

2008

extern JS_PUBLIC_API(JSBool)

2006

JS_EnumerateStub(JSContext *cx, JSObject *obj);

2009

JS_EnumerateStub(JSContext *cx, JSObject *obj);

2007

2010

2008

extern JS_PUBLIC_API(JSBool)

2011

extern JS_PUBLIC_API(JSBool)

Lines 2027-2037 struct JSConstDoubleSpec {	Link Here

2027

 * JSPROP_INDEX bit in flags.

2030

 * JSPROP_INDEX bit in flags.

2028

*/

2031

*/

2029

struct JSPropertySpec {

2032

struct JSPropertySpec {

2030

    const char      *name;

2033

    const char            *name;

2031

    int8            tinyid;

2034

    int8                  tinyid;

2032

    uint8           flags;

2035

    uint8                 flags;

2033

    JSPropertyOp    getter;

2036

    JSPropertyOp          getter;

2034

    JSPropertyOp    setter;

2037

    JSStrictPropertyOp    setter;

2035

};

2038

};

2036

2039

2037

struct JSFunctionSpec {

2040

struct JSFunctionSpec {

Lines 2172-2182 JS_DefineProperties(JSContext *cx, JSObj	Link Here

2172

2175

2173

extern JS_PUBLIC_API(JSBool)

2176

extern JS_PUBLIC_API(JSBool)

2174

JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,

2177

JS_DefineProperty(JSContext *cx, JSObject *obj, const char *name, jsval value,

2175

                  JSPropertyOp getter, JSPropertyOp setter, uintN attrs);

2178

                  JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs);

2176

2179

2177

extern JS_PUBLIC_API(JSBool)

2180

extern JS_PUBLIC_API(JSBool)

2178

JS_DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value,

2181

JS_DefinePropertyById(JSContext *cx, JSObject *obj, jsid id, jsval value,

2179

                      JSPropertyOp getter, JSPropertyOp setter, uintN attrs);

2182

                      JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs);

2180

2183

2181

extern JS_PUBLIC_API(JSBool)

2184

extern JS_PUBLIC_API(JSBool)

2182

JS_DefineOwnProperty(JSContext *cx, JSObject *obj, jsid id, jsval descriptor, JSBool *bp);

2185

JS_DefineOwnProperty(JSContext *cx, JSObject *obj, jsid id, jsval descriptor, JSBool *bp);

Lines 2201-2214 JS_GetPropertyAttrsGetterAndSetter(JSCon	Link Here

2201

                                   const char *name,

2204

                                   const char *name,

2202

                                   uintN *attrsp, JSBool *foundp,

2205

                                   uintN *attrsp, JSBool *foundp,

2203

                                   JSPropertyOp *getterp,

2206

                                   JSPropertyOp *getterp,

2204

                                   JSPropertyOp *setterp);

2207

                                   JSStrictPropertyOp *setterp);

2205

2208

2206

extern JS_PUBLIC_API(JSBool)

2209

extern JS_PUBLIC_API(JSBool)

2207

JS_GetPropertyAttrsGetterAndSetterById(JSContext *cx, JSObject *obj,

2210

JS_GetPropertyAttrsGetterAndSetterById(JSContext *cx, JSObject *obj,

2208

                                       jsid id,

2211

                                       jsid id,

2209

                                       uintN *attrsp, JSBool *foundp,

2212

                                       uintN *attrsp, JSBool *foundp,

2210

                                       JSPropertyOp *getterp,

2213

                                       JSPropertyOp *getterp,

2211

                                       JSPropertyOp *setterp);

2214

                                       JSStrictPropertyOp *setterp);

2212

2215

2213

/*

2216

/*

2214

 * Set the attributes of a property on a given object.

2217

 * Set the attributes of a property on a given object.

Lines 2223-2229 JS_SetPropertyAttributes(JSContext *cx,	Link Here

2223

extern JS_PUBLIC_API(JSBool)

2226

extern JS_PUBLIC_API(JSBool)

2224

JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,

2227

JS_DefinePropertyWithTinyId(JSContext *cx, JSObject *obj, const char *name,

2225

                            int8 tinyid, jsval value,

2228

                            int8 tinyid, jsval value,

2226

                            JSPropertyOp getter, JSPropertyOp setter,

2229

                            JSPropertyOp getter, JSStrictPropertyOp setter,

2227

                            uintN attrs);

2230

                            uintN attrs);

2228

2231

2229

extern JS_PUBLIC_API(JSBool)

2232

extern JS_PUBLIC_API(JSBool)

Lines 2321-2327 JS_DeletePropertyById2(JSContext *cx, JS	Link Here

2321

extern JS_PUBLIC_API(JSBool)

2324

extern JS_PUBLIC_API(JSBool)

2322

JS_DefineUCProperty(JSContext *cx, JSObject *obj,

2325

JS_DefineUCProperty(JSContext *cx, JSObject *obj,

2323

                    const jschar *name, size_t namelen, jsval value,

2326

                    const jschar *name, size_t namelen, jsval value,

2324

                    JSPropertyOp getter, JSPropertyOp setter,

2327

                    JSPropertyOp getter, JSStrictPropertyOp setter,

2325

                    uintN attrs);

2328

                    uintN attrs);

2326

2329

2327

/*

2330

/*

Lines 2345-2351 JS_GetUCPropertyAttrsGetterAndSetter(JSC	Link Here

2345

                                     const jschar *name, size_t namelen,

2348

                                     const jschar *name, size_t namelen,

2346

                                     uintN *attrsp, JSBool *foundp,

2349

                                     uintN *attrsp, JSBool *foundp,

2347

                                     JSPropertyOp *getterp,

2350

                                     JSPropertyOp *getterp,

2348

                                     JSPropertyOp *setterp);

2351

                                     JSStrictPropertyOp *setterp);

2349

2352

2350

/*

2353

/*

2351

 * Set the attributes of a property on a given object.

2354

 * Set the attributes of a property on a given object.

Lines 2363-2369 extern JS_PUBLIC_API(JSBool)	Link Here

2363

JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,

2366

JS_DefineUCPropertyWithTinyId(JSContext *cx, JSObject *obj,

2364

                              const jschar *name, size_t namelen,

2367

                              const jschar *name, size_t namelen,

2365

                              int8 tinyid, jsval value,

2368

                              int8 tinyid, jsval value,

2366

                              JSPropertyOp getter, JSPropertyOp setter,

2369

                              JSPropertyOp getter, JSStrictPropertyOp setter,

2367

                              uintN attrs);

2370

                              uintN attrs);

2368

2371

2369

extern JS_PUBLIC_API(JSBool)

2372

extern JS_PUBLIC_API(JSBool)

Lines 2412-2418 JS_HasArrayLength(JSContext *cx, JSObjec	Link Here

2412

2415

2413

extern JS_PUBLIC_API(JSBool)

2416

extern JS_PUBLIC_API(JSBool)

2414

JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,

2417

JS_DefineElement(JSContext *cx, JSObject *obj, jsint index, jsval value,

2415

                 JSPropertyOp getter, JSPropertyOp setter, uintN attrs);

2418

                 JSPropertyOp getter, JSStrictPropertyOp setter, uintN attrs);

2416

2419

2417

extern JS_PUBLIC_API(JSBool)

2420

extern JS_PUBLIC_API(JSBool)

2418

JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias);

2421

JS_AliasElement(JSContext *cx, JSObject *obj, const char *name, jsint alias);





}

static JSBool
array_length_setter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    jsuint newlen, oldlen, gap, index;
    Value junk;

    uint32 i;

    if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom))
        return array_length_setter(cx, obj, id, strict, vp);

    if (!obj->isDenseArray())
        return js_SetProperty(cx, obj, id, vp, strict);


static JSBool
array_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
                     PropertyOp getter, StrictPropertyOp setter, uintN attrs)
{
    if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom))
        return JS_TRUE;

    Class::NON_NATIVE |
    JSCLASS_HAS_PRIVATE |
    JSCLASS_HAS_CACHED_PROTO(JSProto_Array),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    js_TryValueOf,

    JSCLASS_HAS_PRIVATE |
    JSCLASS_HAS_CACHED_PROTO(JSProto_Array),
    slowarray_addProperty,
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    js_TryValueOf

(-)a/js/src/jsbool.cpp (-4 / +4 lines)

Line	Link Here

Lines 63-72 Class js_BooleanClass = {	Link Here

    "Boolean",

    "Boolean",

    JSCLASS_HAS_RESERVED_SLOTS(1) |

    JSCLASS_HAS_RESERVED_SLOTS(1) |

    JSCLASS_HAS_CACHED_PROTO(JSProto_Boolean),

    JSCLASS_HAS_CACHED_PROTO(JSProto_Boolean),

    PropertyStub,   /* addProperty */

    PropertyStub,         /* addProperty */

    PropertyStub,   /* delProperty */

    PropertyStub,         /* delProperty */

    PropertyStub,   /* getProperty */

    PropertyStub,         /* getProperty */

    PropertyStub,   /* setProperty */

    StrictPropertyStub,   /* setProperty */

    EnumerateStub,

    EnumerateStub,

    ResolveStub,

    ResolveStub,

    ConvertStub

    ConvertStub





}

JS_ALWAYS_INLINE bool
CallJSPropertyOpSetter(JSContext *cx, js::StrictPropertyOp op, JSObject *obj, jsid id,
                       JSBool strict, js::Value *vp)
{
    assertSameCompartment(cx, obj, id, *vp);
    return op(cx, obj, id, strict, vp);
}

inline bool
CallSetter(JSContext *cx, JSObject *obj, jsid id, js::StrictPropertyOp op, uintN attrs,
           uintN shortid, JSBool strict, js::Value *vp)
{
    if (attrs & JSPROP_SETTER)
        return ExternalGetOrSet(cx, obj, id, CastAsObjectJsval(op), JSACC_WRITE, 1, vp, vp);


    if (attrs & JSPROP_SHORTID)
        id = INT_TO_JSID(shortid);
    return CallJSPropertyOpSetter(cx, op, obj, id, strict, vp);
}

#ifdef JS_TRACER





}

bool
JSCompartment::wrap(JSContext *cx, StrictPropertyOp *propp)
{
    Value v = CastAsObjectJsval(*propp);
    if (!wrap(cx, &v))
        return false;
    *propp = CastAsStrictPropertyOp(v.toObjectOrNull());
    return true;
}

bool
JSCompartment::wrap(JSContext *cx, PropertyDescriptor *desc)
{
    return wrap(cx, &desc->obj) &&

(-)a/js/src/jscompartment.h (+1 lines)

Line	Link Here

Lines 389-394 struct JS_FRIEND_API(JSCompartment) {	Link Here

389

    bool wrap(JSContext *cx, JSObject **objp);

389

    bool wrap(JSContext *cx, JSObject **objp);

390

    bool wrapId(JSContext *cx, jsid *idp);

390

    bool wrapId(JSContext *cx, jsid *idp);

391

    bool wrap(JSContext *cx, js::PropertyOp *op);

391

    bool wrap(JSContext *cx, js::PropertyOp *op);

392

    bool wrap(JSContext *cx, js::StrictPropertyOp *op);

392

    bool wrap(JSContext *cx, js::PropertyDescriptor *desc);

393

    bool wrap(JSContext *cx, js::PropertyDescriptor *desc);

393

    bool wrap(JSContext *cx, js::AutoIdVector &props);

394

    bool wrap(JSContext *cx, js::AutoIdVector &props);

394

395

(-)a/js/src/jsdate.cpp (-5 / +5 lines)

Line	Link Here

Lines 493-502 Class js_DateClass = {	Link Here

493

    js_Date_str,

493

    js_Date_str,

494

    JSCLASS_HAS_RESERVED_SLOTS(JSObject::DATE_CLASS_RESERVED_SLOTS) |

494

    JSCLASS_HAS_RESERVED_SLOTS(JSObject::DATE_CLASS_RESERVED_SLOTS) |

495

    JSCLASS_HAS_CACHED_PROTO(JSProto_Date),

495

    JSCLASS_HAS_CACHED_PROTO(JSProto_Date),

496

    PropertyStub,   /* addProperty */

496

    PropertyStub,         /* addProperty */

497

    PropertyStub,   /* delProperty */

497

    PropertyStub,         /* delProperty */

498

    PropertyStub,   /* getProperty */

498

    PropertyStub,         /* getProperty */

499

    PropertyStub,   /* setProperty */

499

    StrictPropertyStub,   /* setProperty */

500

    EnumerateStub,

500

    EnumerateStub,

501

    ResolveStub,

501

    ResolveStub,

502

    ConvertStub

502

    ConvertStub

Lines 2549-2555 js_InitDateClass(JSContext *cx, JSObject	Link Here

2549

    jsid toGMTStringId = ATOM_TO_JSID(cx->runtime->atomState.toGMTStringAtom);

2549

    jsid toGMTStringId = ATOM_TO_JSID(cx->runtime->atomState.toGMTStringAtom);

2550

    if (!js_GetProperty(cx, proto, toUTCStringId, toUTCStringFun.addr()) ||

2550

    if (!js_GetProperty(cx, proto, toUTCStringId, toUTCStringFun.addr()) ||

2551

        !js_DefineProperty(cx, proto, toGMTStringId, toUTCStringFun.addr(),

2551

        !js_DefineProperty(cx, proto, toGMTStringId, toUTCStringFun.addr(),

2552

                           PropertyStub, PropertyStub, 0)) {

2552

                           PropertyStub, StrictPropertyStub, 0)) {

2553

        return NULL;

2553

        return NULL;

2554

2555





    JSCList             links;
    JSObject            *object;        /* weak link, see js_FinalizeObject */
    const Shape         *shape;
    StrictPropertyOp    setter;
    JSWatchPointHandler handler;
    JSObject            *closure;
    uintN               flags;

}

JSBool
js_watch_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    JSRuntime *rt = cx->runtime;
    DBG_LOCK(rt);

                         ? ExternalInvoke(cx, obj,
                                          ObjectValue(*CastAsObject(wp->setter)),
                                          1, vp, vp)
                         : CallJSPropertyOpSetter(cx, wp->setter, obj, userid, strict, vp));

            DBG_LOCK(rt);
            return DropWatchPointAndUnlock(cx, wp, JSWP_HELD) && ok;

    jsid userid = ATOM_TO_JSID(wrapper->atom);

    JS_SET_RVAL(cx, vp, argc ? JS_ARGV(cx, vp)[0] : UndefinedValue());
    /*
     * The strictness we pass here doesn't matter, since we know that it's
     * a JS setter, which can't depend on the assigning code's strictness.
     */
    return js_watch_set(cx, obj, userid, false, vp);
}

static bool

 * with attributes |attrs|, to implement a watchpoint on the property named
 * |id|.
 */
static StrictPropertyOp
WrapWatchedSetter(JSContext *cx, jsid id, uintN attrs, StrictPropertyOp setter)
{
    JSAtom *atom;
    JSFunction *wrapper;

    /* Wrap a C++ setter simply by returning our own C++ setter. */
    if (!(attrs & JSPROP_SETTER))
        return &js_watch_set;   /* & to silence schoolmarmish MSVC */


                             setter ? CastAsObject(setter)->getParent() : NULL, atom);
    if (!wrapper)
        return NULL;
    return CastAsStrictPropertyOp(FUN_OBJECT(wrapper));
}

static bool

    JS_ASSERT(!IsWatchedProperty(cx, newShape));

    /* Create a watching setter we can substitute for the new shape's setter. */
    js::StrictPropertyOp watchingSetter = 
        WrapWatchedSetter(cx, newShape->id, newShape->attributes(), newShape->setter());
    if (!watchingSetter)
        return false;


     * Save the shape's setter; we don't know whether js_ChangeNativePropertyAttrs will
     * return a new shape, or mutate this one.
     */
    js::StrictPropertyOp originalSetter = newShape->setter();

    /*
     * Drop the watching setter into the object, in place of newShape. Note that a single

 * watchpoint-wrapped shape may correspond to more than one non-watchpoint shape; see the
 * comments in UpdateWatchpointShape.
 */
static StrictPropertyOp
UnwrapSetter(JSContext *cx, JSObject *obj, const Shape *shape)
{
    /* If it's not a watched property, its setter is not wrapped. */

    } else if (pobj != obj) {
        /* Clone the prototype property so we can watch the right object. */
        AutoValueRooter valroot(cx);
        PropertyOp getter;
        StrictPropertyOp setter;
        uintN attrs, flags;
        intN shortid;


                !pobj->getAttributes(cx, propid, &attrs)) {
                return JS_FALSE;
            }
            getter = NULL;
            setter = NULL;
            flags = 0;
            shortid = 0;
        }

(-)a/js/src/jsdbgapi.h (-1 / +1 lines)

Line	Link Here

Lines 151-157 js_SweepWatchPoints(JSContext *cx);	Link Here

151

#ifdef __cplusplus

151

#ifdef __cplusplus

152

153

extern JSBool

153

extern JSBool

154

js_watch_set(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

154

js_watch_set(JSContext *cx, JSObject *obj, jsid id, JSBool strict, js::Value *vp);

155

156

#endif

156

#endif

157





    js_Error_str,
    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE | JSCLASS_MARK_IS_TRACE |
    JSCLASS_HAS_CACHED_PROTO(JSProto_Error),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    exn_enumerate,
    (JSResolveOp)exn_resolve,
    ConvertStub,
    exn_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(exn_trace)
};






}

static JSBool
ArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
#ifdef JS_TRACER
    // To be able to set a property here on trace, we would have to make

     */
    AutoValueRooter tvr(cx);
    return js_DeleteProperty(cx, obj, id, tvr.addr(), false) &&
           js_SetProperty(cx, obj, id, vp, strict);
}

static JSBool

}

static JSBool

StrictArgSetter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    if (!InstanceOf(cx, obj, &StrictArgumentsClass, NULL))
        return true;

     * collect its value.
     */
    AutoValueRooter tvr(cx);
    return js_DeleteProperty(cx, obj, id, tvr.addr(), strict) &&
           js_SetProperty(cx, obj, id, vp, strict);
}

static JSBool


    uintN attrs = JSPROP_SHARED | JSPROP_SHADOWABLE;
    PropertyOp getter = StrictArgGetter;
    StrictPropertyOp setter = StrictArgSetter;

    if (JSID_IS_INT(id)) {
        uint32 arg = uint32(JSID_TO_INT(id));

        }

        attrs = JSPROP_PERMANENT | JSPROP_GETTER | JSPROP_SETTER | JSPROP_SHARED;
        getter = CastAsPropertyOp(obj->getThrowTypeError());
        setter = CastAsStrictPropertyOp(obj->getThrowTypeError());
    }

    Value undef = UndefinedValue();

    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::ARGS_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
    PropertyStub,         /* addProperty */
    args_delProperty,
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    args_enumerate,
    (JSResolveOp) args_resolve,
    ConvertStub,
    args_finalize,        /* finalize   */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(args_trace)
};


    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::ARGS_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
    PropertyStub,         /* addProperty */
    args_delProperty,
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    strictargs_enumerate,
    reinterpret_cast<JSResolveOp>(strictargs_resolve),
    ConvertStub,
    args_finalize,        /* finalize   */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(args_trace)
};


Class js_DeclEnvClass = {
    js_Object_str,
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub

}

static JSBool
SetCallArguments(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    if (JSStackFrame *fp = obj->maybeCallObjStackFrame())
        fp->setOverriddenArgs();

}

JSBool
SetCallArg(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    JS_ASSERT((int16) JSID_TO_INT(id) == JSID_TO_INT(id));
    uintN i = (uint16) JSID_TO_INT(id);

}

JSBool
SetCallUpvar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    JS_ASSERT((int16) JSID_TO_INT(id) == JSID_TO_INT(id));
    uintN i = (uint16) JSID_TO_INT(id);

}

JSBool
SetCallVar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    JS_ASSERT(obj->isCall());


js_SetCallArg(JSContext *cx, JSObject *obj, jsid slotid, ValueArgType arg)
{
    Value argcopy = ValueArgToConstRef(arg);
    return SetCallArg(cx, obj, slotid, false /* STRICT DUMMY */, &argcopy);
}
JS_DEFINE_CALLINFO_4(extern, BOOL, js_SetCallArg, CONTEXT, OBJECT, JSID, VALUE, 0,
                     nanojit::ACCSET_STORE_ANY)

js_SetCallVar(JSContext *cx, JSObject *obj, jsid slotid, ValueArgType arg)
{
    Value argcopy = ValueArgToConstRef(arg);
    return SetCallVar(cx, obj, slotid, false /* STRICT DUMMY */, &argcopy);
}
JS_DEFINE_CALLINFO_4(extern, BOOL, js_SetCallVar, CONTEXT, OBJECT, JSID, VALUE, 0,
                     nanojit::ACCSET_STORE_ANY)

    JSCLASS_HAS_PRIVATE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::CALL_RESERVED_SLOTS) |
    JSCLASS_NEW_RESOLVE | JSCLASS_IS_ANONYMOUS | JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    JS_EnumerateStub,
    (JSResolveOp)call_resolve,
    NULL,                 /* convert: Leave it NULL so we notice if calls ever escape */
    NULL,                 /* finalize */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(call_trace)
};


    if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom)) {
        JS_ASSERT(!IsInternalFunctionObject(obj));
        if (!js_DefineNativeProperty(cx, obj, id, Int32Value(fun->nargs),
                                     PropertyStub, StrictPropertyStub,
                                     JSPROP_PERMANENT | JSPROP_READONLY, 0, 0, NULL)) {
            return false;
        }

            JS_ASSERT(!IsInternalFunctionObject(obj));

            if (!js_DefineNativeProperty(cx, obj, id, UndefinedValue(),
                                         fun_getProperty, StrictPropertyStub,
                                         lfp->attrs, Shape::HAS_SHORTID,
                                         lfp->tinyid, NULL)) {
                return false;

        if (JSID_IS_ATOM(id, OFFSET_TO_ATOM(cx->runtime, p.atomOffset))) {
            JS_ASSERT(!IsInternalFunctionObject(obj));

            PropertyOp getter;
            StrictPropertyOp setter;
            uintN attrs = JSPROP_PERMANENT;
            if (fun->isInterpreted() ? fun->inStrictMode() : obj->isBoundFunction()) {
                JSObject *throwTypeError = obj->getThrowTypeError();

                getter = CastAsPropertyOp(throwTypeError);
                setter = CastAsStrictPropertyOp(throwTypeError);
                attrs |= JSPROP_GETTER | JSPROP_SETTER;
            } else {
                getter = fun_getProperty;
                setter = StrictPropertyStub;
            }

            if (!js_DefineNativeProperty(cx, obj, id, UndefinedValue(),

    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
    JSCLASS_HAS_RESERVED_SLOTS(JSFunction::CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_Function),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    fun_enumerate,
    (JSResolveOp)fun_resolve,
    ConvertStub,
    fun_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    js_XDRFunctionObject,
    fun_hasInstance,
    JS_CLASS_TRACE(fun_trace)

js_DefineFunction(JSContext *cx, JSObject *obj, jsid id, Native native,
                  uintN nargs, uintN attrs)
{
    PropertyOp gop;
    StrictPropertyOp sop;
    JSFunction *fun;

    if (attrs & JSFUN_STUB_GSOPS) {

         * for more on this.
         */
        attrs &= ~JSFUN_STUB_GSOPS;
        gop = PropertyStub;
        sop = StrictPropertyStub;
    } else {
        gop = NULL;
        sop = NULL;
    }

    /*

    if (!wasDelegate && obj->isDelegate())
        obj->clearDelegate();

    if (!obj->defineProperty(cx, id, ObjectValue(*fun), gop, sop, attrs & ~JSFUN_FLAGS_MASK))
        return NULL;
    return fun;
}

(-)a/js/src/jsfun.h (-3 / +3 lines)

Line	Link Here

Lines 529-541 extern JSBool	Link Here

529

GetCallUpvar(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

529

GetCallUpvar(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

530

531

extern JSBool

531

extern JSBool

532

SetCallArg(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

532

SetCallArg(JSContext *cx, JSObject *obj, jsid id, JSBool strict, js::Value *vp);

533

534

extern JSBool

534

extern JSBool

535

SetCallVar(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

535

SetCallVar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, js::Value *vp);

536

537

extern JSBool

537

extern JSBool

538

SetCallUpvar(JSContext *cx, JSObject *obj, jsid id, js::Value *vp);

538

SetCallUpvar(JSContext *cx, JSObject *obj, jsid id, JSBool strict, js::Value *vp);

539

540

} // namespace js

540

} // namespace js

541





Class js_NoSuchMethodClass = {
    "NoSuchMethod",
    JSCLASS_HAS_RESERVED_SLOTS(2) | JSCLASS_IS_ANONYMOUS,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,

        }                                                                     \
    JS_END_MACRO

#define NATIVE_SET(cx,obj,shape,entry,strict,vp)                              \
    JS_BEGIN_MACRO                                                            \
        if (shape->hasDefaultSetter() &&                                      \
            (shape)->slot != SHAPE_INVALID_SLOT &&                            \

            /* Fast path for, e.g., plain Object instance properties. */      \
            (obj)->nativeSetSlot((shape)->slot, *vp);                         \
        } else {                                                              \
            if (!js_NativeSet(cx, obj, shape, false, strict, vp))             \
                goto error;                                                   \
        }                                                                     \
    JS_END_MACRO

    JSObject &obj = regs.fp->varobj(cx);
    const Value &ref = regs.sp[-1];
    if (!obj.defineProperty(cx, ATOM_TO_JSID(atom), ref,
                            PropertyStub, StrictPropertyStub,
                            JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY)) {
        goto error;
    }

    jsid id;
    FETCH_ELEMENT_ID(obj, -1, id);
    if (!obj->defineProperty(cx, id, ref,
                             PropertyStub, StrictPropertyStub,
                             JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY)) {
        goto error;
    }


                    PCMETER(cache->pchits++);
                    PCMETER(cache->setpchits++);
                    NATIVE_SET(cx, obj, shape, entry, script->strictModeCode, &rval);
                    break;
                }
            } else {


    /* Bind a variable only if it's not yet defined. */
    if (!prop) {
        if (!js_DefineNativeProperty(cx, obj, id, UndefinedValue(),
                                     PropertyStub, StrictPropertyStub, attrs, 0, 0, &prop)) {
            goto error;
        }
        JS_ASSERT(prop);

    do {
        /* Steps 5d, 5f. */
        if (!prop || pobj != parent) {
            if (!parent->defineProperty(cx, id, rval, PropertyStub, StrictPropertyStub, attrs))
                goto error;
            break;
        }

        Shape *shape = reinterpret_cast<Shape *>(prop);
        if (parent->isGlobal()) {
            if (shape->configurable()) {
                if (!parent->defineProperty(cx, id, rval, PropertyStub, StrictPropertyStub, attrs))
                    goto error;
                break;
            }


    if ((attrs == JSPROP_ENUMERATE)
        ? !parent.setProperty(cx, id, &rval, script->strictModeCode)
        : !parent.defineProperty(cx, id, rval, PropertyStub, StrictPropertyStub, attrs)) {
        goto error;
    }
}

    if (!CheckAccess(cx, obj, id, JSACC_WATCH, &rtmp, &attrs))
        goto error;

    PropertyOp getter;
    StrictPropertyOp setter;
    if (op == JSOP_GETTER) {
        getter = CastAsPropertyOp(&rval.toObject());
        setter = StrictPropertyStub;
        attrs = JSPROP_GETTER;
    } else {
        getter = PropertyStub;
        setter = CastAsStrictPropertyOp(&rval.toObject());
        attrs = JSPROP_SETTER;
    }
    attrs |= JSPROP_ENUMERATE | JSPROP_SHARED;





    "Iterator",
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_Iterator) |
    JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    iterator_finalize,
    NULL,                 /* reserved    */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(iterator_trace),
    {
        NULL,             /* equality       */
        NULL,             /* outerObject    */
        NULL,             /* innerObject    */
        iterator_iterator,
        NULL              /* unused  */
    }
};


    js_StopIteration_str,
    JSCLASS_HAS_CACHED_PROTO(JSProto_StopIteration) |
    JSCLASS_FREEZE_PROTO,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize    */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    stopiter_hasInstance
};


    js_Generator_str,
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_Generator) |
    JSCLASS_IS_ANONYMOUS | JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    generator_finalize,
    NULL,                 /* reserved    */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(generator_trace),
    {
        NULL,             /* equality       */
        NULL,             /* outerObject    */
        NULL,             /* innerObject    */
        iterator_iterator,
        NULL              /* unused */
    }
};


(-)a/js/src/jsmath.cpp (-5 / +5 lines)

Line	Link Here

Lines 107-116 MathCache::MathCache() {	Link Here

107

Class js_MathClass = {

107

Class js_MathClass = {

108

    js_Math_str,

108

    js_Math_str,

109

    JSCLASS_HAS_CACHED_PROTO(JSProto_Math),

109

    JSCLASS_HAS_CACHED_PROTO(JSProto_Math),

110

    PropertyStub,   /* addProperty */

110

    PropertyStub,         /* addProperty */

111

    PropertyStub,   /* delProperty */

111

    PropertyStub,         /* delProperty */

112

    PropertyStub,   /* getProperty */

112

    PropertyStub,         /* getProperty */

113

    PropertyStub,   /* setProperty */

113

    StrictPropertyStub,   /* setProperty */

114

    EnumerateStub,

114

    EnumerateStub,

115

    ResolveStub,

115

    ResolveStub,

116

    ConvertStub

116

    ConvertStub

Lines 873-879 js_InitMathClass(JSContext *cx, JSObject	Link Here

873

    if (!Math)

873

    if (!Math)

874

        return NULL;

874

        return NULL;

875

    if (!JS_DefineProperty(cx, obj, js_Math_str, OBJECT_TO_JSVAL(Math),

875

    if (!JS_DefineProperty(cx, obj, js_Math_str, OBJECT_TO_JSVAL(Math),

876

                           JS_PropertyStub, JS_PropertyStub, 0)) {

876

                           JS_PropertyStub, JS_StrictPropertyStub, 0)) {

877

        return NULL;

877

        return NULL;

878

879





Class js_NumberClass = {
    js_Number_str,
    JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_HAS_CACHED_PROTO(JSProto_Number),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub

    /* ECMA 15.1.1.1 */
    rt = cx->runtime;
    if (!JS_DefineProperty(cx, obj, js_NaN_str, Jsvalify(rt->NaNValue),
                           JS_PropertyStub, JS_StrictPropertyStub,
                           JSPROP_PERMANENT | JSPROP_READONLY)) {
        return NULL;
    }

    /* ECMA 15.1.1.2 */
    if (!JS_DefineProperty(cx, obj, js_Infinity_str, Jsvalify(rt->positiveInfinityValue),
                           JS_PropertyStub, JS_StrictPropertyStub,
                           JSPROP_PERMANENT | JSPROP_READONLY)) {
        return NULL;
    }





Class js_ObjectClass = {
    js_Object_str,
    JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub

obj_getProto(JSContext *cx, JSObject *obj, jsid id, Value *vp);

static JSBool
obj_setProto(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp);

static JSPropertySpec object_props[] = {
    {js_proto_str, 0, JSPROP_PERMANENT|JSPROP_SHARED, Jsvalify(obj_getProto), Jsvalify(obj_setProto)},

}

static JSBool
obj_setProto(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    /* ECMAScript 5 8.6.2 forbids changing [[Prototype]] if not [[Extensible]]. */
    if (!obj->isExtensible()) {

    if (!CheckAccess(cx, obj, id, JSACC_WATCH, &junk, &attrs))
        return JS_FALSE;
    vp->setUndefined();
    return obj->defineProperty(cx, id, UndefinedValue(), getter, StrictPropertyStub,
                               JSPROP_ENUMERATE | JSPROP_GETTER | JSPROP_SHARED);
}


                             js_setter_str);
        return JS_FALSE;
    }
    StrictPropertyOp setter = CastAsStrictPropertyOp(&vp[3].toObject());

    jsid id;
    if (!ValueToId(cx, vp[2], &id))

    const JSAtomState &atomState = cx->runtime->atomState;
    if (attrs & (JSPROP_GETTER | JSPROP_SETTER)) {
        if (!desc->defineProperty(cx, ATOM_TO_JSID(atomState.getAtom), getter,
                                  PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE) ||
            !desc->defineProperty(cx, ATOM_TO_JSID(atomState.setAtom), setter,
                                  PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE)) {
            return false;
        }
    } else {
        if (!desc->defineProperty(cx, ATOM_TO_JSID(atomState.valueAtom), value,
                                  PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE) ||
            !desc->defineProperty(cx, ATOM_TO_JSID(atomState.writableAtom),
                                  BooleanValue((attrs & JSPROP_READONLY) == 0),
                                  PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE)) {
            return false;
        }
    }

    return desc->defineProperty(cx, ATOM_TO_JSID(atomState.enumerableAtom),
                                BooleanValue((attrs & JSPROP_ENUMERATE) != 0),
                                PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE) &&
           desc->defineProperty(cx, ATOM_TO_JSID(atomState.configurableAtom),
                                BooleanValue((attrs & JSPROP_PERMANENT) == 0),
                                PropertyStub, StrictPropertyStub, JSPROP_ENUMERATE);
}

JSBool

        if (desc.isGenericDescriptor() || desc.isDataDescriptor()) {
            JS_ASSERT(!obj->getOps()->defineProperty);
            return js_DefineProperty(cx, obj, desc.id, &desc.value,
                                     PropertyStub, StrictPropertyStub, desc.attrs);
        }

        JS_ASSERT(desc.isAccessorDescriptor());


    /* 8.12.9 step 12. */
    uintN attrs;
    PropertyOp getter;
    StrictPropertyOp setter;
    if (desc.isGenericDescriptor()) {
        uintN changed = 0;
        if (desc.hasConfigurable)

        attrs = (shape->attributes() & ~changed) | (desc.attrs & changed);
        if (shape->isMethod()) {
            JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
            getter = PropertyStub;
            setter = StrictPropertyStub;
        } else {
            getter = shape->getter();
            setter = shape->setter();

        if (desc.hasValue)
            v = desc.value;
        attrs = (desc.attrs & ~unchanged) | (shape->attributes() & unchanged);
        getter = PropertyStub;
        setter = StrictPropertyStub;
    } else {
        JS_ASSERT(desc.isAccessorDescriptor());


            setter = desc.setter();
        } else {
            setter = (shape->hasDefaultSetter() && !shape->hasSetterValue())
                     ? StrictPropertyStub
                     : shape->setter();
        }
    }

Class js_WithClass = {
    "With",
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(2) | JSCLASS_IS_ANONYMOUS,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize */
    NULL,                 /* reserved    */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    NULL,                 /* mark        */
    JS_NULL_CLASS_EXT,
    {
        with_LookupProperty,
        NULL,             /* defineProperty */
        with_GetProperty,
        with_SetProperty,
        with_GetAttributes,

        with_DeleteProperty,
        with_Enumerate,
        with_TypeOf,
        NULL,             /* trace */
        NULL,             /* fix   */
        with_ThisObject,
        NULL,             /* clear */
    }
};


}

static JSBool
block_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    JS_ASSERT(obj->isClonedBlock());
    uintN index = (uintN) JSID_TO_INT(id);

        PropertyOp getter = shape->getter();
        if ((attrs & JSPROP_GETTER) && !cx->compartment->wrap(cx, &getter))
            return false;
        StrictPropertyOp setter = shape->setter();
        if ((attrs & JSPROP_SETTER) && !cx->compartment->wrap(cx, &setter))
            return false;
        Value v = shape->hasSlot() ? obj->getSlot(shape->slot) : UndefinedValue();

Class js_BlockClass = {
    "Block",
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_IS_ANONYMOUS,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub

            uint32 slot = 2 * JSProto_LIMIT + key;
            if (!js_SetReservedSlot(cx, obj, slot, v))
                return false;
            if (!obj->addProperty(cx, id, PropertyStub, StrictPropertyStub, slot, attrs, 0, 0))
                return false;

            named = true;

        }
    }

    named = obj->defineProperty(cx, id, v, PropertyStub, StrictPropertyStub, attrs);
    return named;
}



const Shape *
js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,
                     PropertyOp getter, StrictPropertyOp setter, uint32 slot,
                     uintN attrs, uintN flags, intN shortid)
{
    JS_ASSERT(!(flags & Shape::METHOD));

const Shape *
js_ChangeNativePropertyAttrs(JSContext *cx, JSObject *obj,
                             const Shape *shape, uintN attrs, uintN mask,
                             PropertyOp getter, StrictPropertyOp setter)
{
    if (!obj->ensureClassReservedSlots(cx))
        return NULL;


JSBool
js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
                  PropertyOp getter, StrictPropertyOp setter, uintN attrs)
{
    return js_DefineNativeProperty(cx, obj, id, *value, getter, setter, attrs,
                                   0, 0, NULL);


JSBool
js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const Value &value,
                        PropertyOp getter, StrictPropertyOp setter, uintN attrs,
                        uintN flags, intN shortid, JSProperty **propp,
                        uintN defineHow /* = 0 */)
{

}

JSBool
js_NativeSet(JSContext *cx, JSObject *obj, const Shape *shape, bool added, bool strict, Value *vp)
{
    LeaveTraceIfGlobalObject(cx, obj);


    sample = cx->runtime->propertyRemovals;
    {
        AutoShapeRooter tvr(cx, shape);
        if (!shape->set(cx, obj, strict, vp))
            return false;

        JS_ASSERT_IF(!obj->inDictionaryMode(), shape->slot == slot);

    uintN attrs, flags;
    intN shortid;
    Class *clasp;
    PropertyOp getter;
    StrictPropertyOp setter;
    bool added;

    JS_ASSERT((defineHow &

                    return false;

                if (pd.attrs & JSPROP_SHARED)
                    return CallSetter(cx, obj, id, pd.setter, pd.attrs, pd.shortid, strict, vp);

                if (pd.attrs & JSPROP_READONLY) {
                    if (strict)

                if (shape->hasDefaultSetter() && !shape->hasGetterValue())
                    return JS_TRUE;

                return shape->set(cx, obj, strict, vp);
            }

            /*

                    vp->setObject(*funobj);
                }
            }
            return identical || js_NativeSet(cx, obj, shape, false, strict, vp);
        }
    }


    if (defineHow & JSDNP_CACHE_RESULT)
        JS_PROPERTY_CACHE(cx).fill(cx, obj, 0, 0, obj, shape, added);

    return js_NativeSet(cx, obj, shape, added, strict, vp);

#ifdef JS_TRACER
  error: // TRACE_1 jumps here in case of error.

     * DontDelete.
     */
    if (!ctor->defineProperty(cx, ATOM_TO_JSID(cx->runtime->atomState.classPrototypeAtom),
                              ObjectOrNullValue(proto), PropertyStub, StrictPropertyStub, attrs)) {
        return JS_FALSE;
    }


     * for a user-defined function f, is DontEnum.
     */
    return proto->defineProperty(cx, ATOM_TO_JSID(cx->runtime->atomState.constructorAtom),
                                 ObjectOrNullValue(ctor), PropertyStub, StrictPropertyStub, 0);
}

JSBool

(-)a/js/src/jsobj.h (-12 / +30 lines)

Line	Link Here

Lines 72-77 CastAsPropertyOp(JSObject *object)	Link Here

    return JS_DATA_TO_FUNC_PTR(PropertyOp, object);

    return JS_DATA_TO_FUNC_PTR(PropertyOp, object);

static inline StrictPropertyOp

CastAsStrictPropertyOp(JSObject *object)

    return JS_DATA_TO_FUNC_PTR(StrictPropertyOp, object);

static inline JSPropertyOp

static inline JSPropertyOp

CastAsJSPropertyOp(JSObject *object)

CastAsJSPropertyOp(JSObject *object)

Lines 84-95 CastAsObject(PropertyOp op)	Link Here

    return JS_FUNC_TO_DATA_PTR(JSObject *, op);

    return JS_FUNC_TO_DATA_PTR(JSObject *, op);

inline JSObject *

CastAsObject(StrictPropertyOp op)

    return JS_FUNC_TO_DATA_PTR(JSObject *, op);

inline Value

inline Value

CastAsObjectJsval(PropertyOp op)

100

CastAsObjectJsval(PropertyOp op)

101

    return ObjectOrNullValue(CastAsObject(op));

102

    return ObjectOrNullValue(CastAsObject(op));

103

104

105

inline Value

106

CastAsObjectJsval(StrictPropertyOp op)

107

108

    return ObjectOrNullValue(CastAsObject(op));

109

110

} /* namespace js */

111

} /* namespace js */

112

/*

113

/*

Lines 149-156 struct PropDesc {	Link Here

149

    js::PropertyOp getter() const {

167

    js::PropertyOp getter() const {

150

        return js::CastAsPropertyOp(getterObject());

168

        return js::CastAsPropertyOp(getterObject());

151

169

152

    js::PropertyOp setter() const {

170

    js::StrictPropertyOp setter() const {

153

        return js::CastAsPropertyOp(setterObject());

171

        return js::CastAsStrictPropertyOp(setterObject());

154

172

155

173

156

    js::Value pd;

174

    js::Value pd;

Lines 206-212 js_LookupProperty(JSContext *cx, JSObjec	Link Here

206

224

207

extern JSBool

225

extern JSBool

208

js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, const js::Value *value,

226

js_DefineProperty(JSContext *cx, JSObject *obj, jsid id, const js::Value *value,

209

                  js::PropertyOp getter, js::PropertyOp setter, uintN attrs);

227

                  js::PropertyOp getter, js::StrictPropertyOp setter, uintN attrs);

210

228

211

extern JSBool

229

extern JSBool

212

js_GetProperty(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, js::Value *vp);

230

js_GetProperty(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, js::Value *vp);

Lines 1132-1138 struct JSObject : js::gc::Cell {	Link Here

1132

     * 2. !isExtensible() checking must be done by callers.

1150

     * 2. !isExtensible() checking must be done by callers.

1133

*/

1151

*/

1134

    const js::Shape *addPropertyInternal(JSContext *cx, jsid id,

1152

    const js::Shape *addPropertyInternal(JSContext *cx, jsid id,

1135

                                         js::PropertyOp getter, js::PropertyOp setter,

1153

                                         js::PropertyOp getter, js::StrictPropertyOp setter,

1136

                                         uint32 slot, uintN attrs,

1154

                                         uint32 slot, uintN attrs,

1137

                                         uintN flags, intN shortid,

1155

                                         uintN flags, intN shortid,

1138

                                         js::Shape **spp);

1156

                                         js::Shape **spp);

Lines 1142-1148 struct JSObject : js::gc::Cell {	Link Here

1142

  public:

1160

  public:

1143

    /* Add a property whose id is not yet in this scope. */

1161

    /* Add a property whose id is not yet in this scope. */

1144

    const js::Shape *addProperty(JSContext *cx, jsid id,

1162

    const js::Shape *addProperty(JSContext *cx, jsid id,

1145

                                 js::PropertyOp getter, js::PropertyOp setter,

1163

                                 js::PropertyOp getter, js::StrictPropertyOp setter,

1146

                                 uint32 slot, uintN attrs,

1164

                                 uint32 slot, uintN attrs,

1147

                                 uintN flags, intN shortid);

1165

                                 uintN flags, intN shortid);

1148

1166

Lines 1154-1166 struct JSObject : js::gc::Cell {	Link Here

1154

1172

1155

    /* Add or overwrite a property for id in this scope. */

1173

    /* Add or overwrite a property for id in this scope. */

1156

    const js::Shape *putProperty(JSContext *cx, jsid id,

1174

    const js::Shape *putProperty(JSContext *cx, jsid id,

1157

                                 js::PropertyOp getter, js::PropertyOp setter,

1175

                                 js::PropertyOp getter, js::StrictPropertyOp setter,

1158

                                 uint32 slot, uintN attrs,

1176

                                 uint32 slot, uintN attrs,

1159

                                 uintN flags, intN shortid);

1177

                                 uintN flags, intN shortid);

1160

1178

1161

    /* Change the given property into a sibling with the same id in this scope. */

1179

    /* Change the given property into a sibling with the same id in this scope. */

1162

    const js::Shape *changeProperty(JSContext *cx, const js::Shape *shape, uintN attrs, uintN mask,

1180

    const js::Shape *changeProperty(JSContext *cx, const js::Shape *shape, uintN attrs, uintN mask,

1163

                                    js::PropertyOp getter, js::PropertyOp setter);

1181

                                    js::PropertyOp getter, js::StrictPropertyOp setter);

1164

1182

1165

    /* Remove the property named by id from this object. */

1183

    /* Remove the property named by id from this object. */

1166

    bool removeProperty(JSContext *cx, jsid id);

1184

    bool removeProperty(JSContext *cx, jsid id);

Lines 1175-1181 struct JSObject : js::gc::Cell {	Link Here

1175

1193

1176

    JSBool defineProperty(JSContext *cx, jsid id, const js::Value &value,

1194

    JSBool defineProperty(JSContext *cx, jsid id, const js::Value &value,

1177

                          js::PropertyOp getter = js::PropertyStub,

1195

                          js::PropertyOp getter = js::PropertyStub,

1178

                          js::PropertyOp setter = js::PropertyStub,

1196

                          js::StrictPropertyOp setter = js::StrictPropertyStub,

1179

                          uintN attrs = JSPROP_ENUMERATE) {

1197

                          uintN attrs = JSPROP_ENUMERATE) {

1180

        js::DefinePropOp op = getOps()->defineProperty;

1198

        js::DefinePropOp op = getOps()->defineProperty;

1181

        return (op ? op : js_DefineProperty)(cx, this, id, &value, getter, setter, attrs);

1199

        return (op ? op : js_DefineProperty)(cx, this, id, &value, getter, setter, attrs);

Lines 1565-1571 js_PurgeScopeChain(JSContext *cx, JSObje	Link Here

1565

*/

1583

*/

1566

extern const js::Shape *

1584

extern const js::Shape *

1567

js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,

1585

js_AddNativeProperty(JSContext *cx, JSObject *obj, jsid id,

1568

                     js::PropertyOp getter, js::PropertyOp setter, uint32 slot,

1586

                     js::PropertyOp getter, js::StrictPropertyOp setter, uint32 slot,

1569

                     uintN attrs, uintN flags, intN shortid);

1587

                     uintN attrs, uintN flags, intN shortid);

1570

1588

1571

/*

1589

/*

Lines 1576-1582 js_AddNativeProperty(JSContext *cx, JSOb	Link Here

1576

extern const js::Shape *

1594

extern const js::Shape *

1577

js_ChangeNativePropertyAttrs(JSContext *cx, JSObject *obj,

1595

js_ChangeNativePropertyAttrs(JSContext *cx, JSObject *obj,

1578

                             const js::Shape *shape, uintN attrs, uintN mask,

1596

                             const js::Shape *shape, uintN attrs, uintN mask,

1579

                             js::PropertyOp getter, js::PropertyOp setter);

1597

                             js::PropertyOp getter, js::StrictPropertyOp setter);

1580

1598

1581

extern JSBool

1599

extern JSBool

1582

js_DefineOwnProperty(JSContext *cx, JSObject *obj, jsid id,

1600

js_DefineOwnProperty(JSContext *cx, JSObject *obj, jsid id,

Lines 1601-1607 const uintN JSDNP_UNQUALIFIED = 8; /* U	Link Here

1601

*/

1619

*/

1602

extern JSBool

1620

extern JSBool

1603

js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const js::Value &value,

1621

js_DefineNativeProperty(JSContext *cx, JSObject *obj, jsid id, const js::Value &value,

1604

                        js::PropertyOp getter, js::PropertyOp setter, uintN attrs,

1622

                        js::PropertyOp getter, js::StrictPropertyOp setter, uintN attrs,

1605

                        uintN flags, intN shortid, JSProperty **propp,

1623

                        uintN flags, intN shortid, JSProperty **propp,

1606

                        uintN defineHow = 0);

1624

                        uintN defineHow = 0);

1607

1625

Lines 1686-1692 js_NativeGet(JSContext cx, JSObject ob	Link Here

1686

1704

1687

extern JSBool

1705

extern JSBool

1688

js_NativeSet(JSContext *cx, JSObject *obj, const js::Shape *shape, bool added,

1706

js_NativeSet(JSContext *cx, JSObject *obj, const js::Shape *shape, bool added,

1689

             js::Value *vp);

1707

             bool strict, js::Value *vp);

1690

1708

1691

extern JSBool

1709

extern JSBool

1692

js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uint32 getHow, js::Value *vp);

1710

js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uint32 getHow, js::Value *vp);

(-)a/js/src/jsobjinlines.h (-1 / +2 lines)

Line	Link Here

Lines 835-841 class AutoPropertyDescriptorRooter : pri	Link Here

835

    AutoPropertyDescriptorRooter(JSContext *cx) : AutoGCRooter(cx, DESCRIPTOR) {

835

    AutoPropertyDescriptorRooter(JSContext *cx) : AutoGCRooter(cx, DESCRIPTOR) {

836

        obj = NULL;

836

        obj = NULL;

837

        attrs = 0;

837

        attrs = 0;

838

        getter = setter = (PropertyOp) NULL;

838

        getter = (PropertyOp) NULL;

839

        setter = (StrictPropertyOp) NULL;

839

        value.setUndefined();

840

        value.setUndefined();

840

841

842

(-)a/js/src/json.cpp (-5 / +5 lines)

Line	Link Here

Lines 100-109 struct JSONParser	Link Here

100

Class js_JSONClass = {

100

Class js_JSONClass = {

101

    js_JSON_str,

101

    js_JSON_str,

102

    JSCLASS_HAS_CACHED_PROTO(JSProto_JSON),

102

    JSCLASS_HAS_CACHED_PROTO(JSProto_JSON),

103

    PropertyStub,   /* addProperty */

103

    PropertyStub,        /* addProperty */

104

    PropertyStub,   /* delProperty */

104

    PropertyStub,        /* delProperty */

105

    PropertyStub,   /* getProperty */

105

    PropertyStub,        /* getProperty */

106

    PropertyStub,   /* setProperty */

106

    StrictPropertyStub,  /* setProperty */

107

    EnumerateStub,

107

    EnumerateStub,

108

    ResolveStub,

108

    ResolveStub,

109

    ConvertStub

109

    ConvertStub

Lines 1259-1265 js_InitJSONClass(JSContext *cx, JSObject	Link Here

1259

    if (!JSON)

1259

    if (!JSON)

1260

        return NULL;

1260

        return NULL;

1261

    if (!JS_DefineProperty(cx, obj, js_JSON_str, OBJECT_TO_JSVAL(JSON),

1261

    if (!JS_DefineProperty(cx, obj, js_JSON_str, OBJECT_TO_JSVAL(JSON),

1262

                           JS_PropertyStub, JS_PropertyStub, 0))

1262

                           JS_PropertyStub, JS_StrictPropertyStub, 0))

1263

        return NULL;

1263

        return NULL;

1264

1265

    if (!JS_DefineFunctions(cx, JSON, json_static_methods))

1265

    if (!JS_DefineFunctions(cx, JSON, json_static_methods))

(-)a/js/src/jsparse.cpp (-3 / +2 lines)

Line	Link Here

Lines 1183-1191 Compiler::defineGlobals(JSContext *cx, G	Link Here

1183

1184

        JSProperty *prop;

1184

        JSProperty *prop;

1185

1186

        if (!js_DefineNativeProperty(cx, globalObj, id, rval, PropertyStub,

1186

        if (!js_DefineNativeProperty(cx, globalObj, id, rval, PropertyStub, StrictPropertyStub,

1187

                                     PropertyStub, JSPROP_ENUMERATE | JSPROP_PERMANENT,

1187

                                     JSPROP_ENUMERATE | JSPROP_PERMANENT, 0, 0, &prop)) {

1188

                                     0, 0, &prop)) {

1189

            return false;

1188

            return false;

1190

1189

1191

1190





}

bool
JSProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
                    Value *vp)
{
    JS_ASSERT(OperationInProgress(cx, proxy));
    AutoPropertyDescriptorRooter desc(cx);

        return false;
    /* The control-flow here differs from ::get() because of the fall-through case below. */
    if (desc.obj) {
        if (desc.setter && ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub))
            return CallSetter(cx, receiver, id, desc.setter, desc.attrs, desc.shortid, strict, vp);
        if (desc.attrs & JSPROP_READONLY)
            return true;
        desc.value = *vp;

    if (!getPropertyDescriptor(cx, proxy, id, true, &desc))
        return false;
    if (desc.obj) {
        if (desc.setter && ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub))
            return CallSetter(cx, receiver, id, desc.setter, desc.attrs, desc.shortid, strict, vp);
        if (desc.attrs & JSPROP_READONLY)
            return true;
        /* fall through */

    virtual bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
    virtual bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);
    virtual bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *vp);
    virtual bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
                     Value *vp);
    virtual bool keys(JSContext *cx, JSObject *proxy, AutoIdVector &props);
    virtual bool iterate(JSContext *cx, JSObject *proxy, uintN flags, Value *vp);


}

bool
JSScriptedProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,
                            Value *vp)
{
    JSObject *handler = GetProxyHandlerObject(cx, proxy);
    JSString *str = js_ValueToString(cx, IdToValue(id));

    if (!GetDerivedTrap(cx, handler, ATOM(set), fval.addr()))
        return false;
    if (!js_IsCallable(fval.value()))
        return JSProxyHandler::set(cx, proxy, receiver, id, strict, vp);
    return Trap(cx, handler, fval.value(), 3, argv, tvr.addr());
}


}

bool
JSProxy::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict, Value *vp)
{
    JS_CHECK_RECURSION(cx, return false);
    AutoPendingProxyOperation pending(cx, proxy);
    return proxy->getProxyHandler()->set(cx, proxy, receiver, id, strict, vp);
}

bool


static JSBool
proxy_DefineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *value,
                     PropertyOp getter, StrictPropertyOp setter, uintN attrs)
{
    AutoPropertyDescriptorRooter desc(cx);
    desc.obj = obj;

static JSBool
proxy_SetProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp, JSBool strict)
{
    return JSProxy::set(cx, obj, obj, id, strict, vp);
    return JSProxy::set(cx, obj, obj, id, vp);
}

static JSBool

JS_FRIEND_API(Class) ObjectProxyClass = {
    "Proxy",
    Class::NON_NATIVE | JSCLASS_HAS_RESERVED_SLOTS(3),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    proxy_HasInstance,    /* hasInstance */
    NULL,                 /* mark        */
    JS_NULL_CLASS_EXT,
    {
        proxy_LookupProperty,

        proxy_GetAttributes,
        proxy_SetAttributes,
        proxy_DeleteProperty,
        NULL,             /* enumerate       */
        proxy_TypeOf,
        proxy_TraceObject,
        NULL,             /* fix             */
        NULL,             /* thisObject      */
        proxy_Finalize,   /* clear */
    }
};

JS_FRIEND_API(Class) OuterWindowProxyClass = {
    "Proxy",
    Class::NON_NATIVE | JSCLASS_HAS_RESERVED_SLOTS(3),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    NULL,                 /* mark        */
    {
        NULL,             /* equality    */
        NULL,             /* outerObject */
        proxy_innerObject,
        NULL        /* unused */
    },

        proxy_GetAttributes,
        proxy_SetAttributes,
        proxy_DeleteProperty,
        NULL,             /* enumerate       */
        NULL,             /* typeof          */
        proxy_TraceObject,
        NULL,             /* fix             */
        NULL,             /* thisObject      */
        proxy_Finalize,   /* clear */
    }
};


JS_FRIEND_API(Class) FunctionProxyClass = {
    "Proxy",
    Class::NON_NATIVE | JSCLASS_HAS_RESERVED_SLOTS(5),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    proxy_Call,
    proxy_Construct,
    NULL,                 /* xdrObject   */
    js_FunctionClass.hasInstance,
    NULL,                 /* mark */
    JS_NULL_CLASS_EXT,
    {
        proxy_LookupProperty,

        proxy_GetAttributes,
        proxy_SetAttributes,
        proxy_DeleteProperty,
        NULL,             /* enumerate       */
        proxy_TypeOf,
        proxy_TraceObject,
        NULL,             /* fix             */
        NULL,             /* thisObject      */
        NULL,             /* clear           */
    }
};


Class CallableObjectClass = {
    "Function",
    JSCLASS_HAS_RESERVED_SLOTS(2),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    NULL,                 /* finalize    */
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    callable_Call,
    callable_Construct,
};

Class js_ProxyClass = {
    "Proxy",
    JSCLASS_HAS_CACHED_PROTO(JSProto_Proxy),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub

    if (!module)
        return NULL;
    if (!JS_DefineProperty(cx, obj, "Proxy", OBJECT_TO_JSVAL(module),
                           JS_PropertyStub, JS_StrictPropertyStub, 0)) {
        return NULL;
    }
    if (!JS_DefineFunctions(cx, module, static_methods))

(-)a/js/src/jsproxy.h (-2 / +4 lines)

Line	Link Here

Lines 71-77 class JS_FRIEND_API(JSProxyHandler) {	Link Here

    virtual bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

    virtual bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

    virtual bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,

                     js::Value *vp);

    virtual bool keys(JSContext *cx, JSObject *proxy, js::AutoIdVector &props);

    virtual bool keys(JSContext *cx, JSObject *proxy, js::AutoIdVector &props);

    virtual bool iterate(JSContext *cx, JSObject *proxy, uintN flags, js::Value *vp);

    virtual bool iterate(JSContext *cx, JSObject *proxy, uintN flags, js::Value *vp);

Lines 117-123 class JSProxy {	Link Here

117

    static bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

118

    static bool has(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

118

    static bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

119

    static bool hasOwn(JSContext *cx, JSObject *proxy, jsid id, bool *bp);

119

    static bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *vp);

120

    static bool get(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *vp);

120

    static bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, Value *vp);

121

    static bool set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id, bool strict,

122

                    Value *vp);

121

    static bool keys(JSContext *cx, JSObject *proxy, js::AutoIdVector &props);

123

    static bool keys(JSContext *cx, JSObject *proxy, js::AutoIdVector &props);

122

    static bool iterate(JSContext *cx, JSObject *proxy, uintN flags, Value *vp);

124

    static bool iterate(JSContext *cx, JSObject *proxy, uintN flags, Value *vp);

123

125





/* JSClass (and js::ObjectOps where appropriate) function pointer typedefs. */

/*
 * Add, delete, or get a property named by id in obj.  Note the jsid id
 * type -- id may be a string (Unicode property identifier) or an int (element
 * index).  The *vp out parameter, on success, is the new property value after
 * an add or get.  After a successful delete, *vp is JSVAL_FALSE iff
 * obj[id] can't be deleted (because it's permanent).
 */
typedef JSBool
(* JSPropertyOp)(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

/*
 * Set a property named by id in obj, treating the assignment as strict
 * mode code if strict is true. Note the jsid id type -- id may be a string
 * (Unicode property identifier) or an int (element index). The *vp out
 * parameter, on success, is the new property value after the
 * set.
 */
typedef JSBool
(* JSStrictPropertyOp)(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);

/*
 * This function type is used for callbacks that enumerate the properties of
 * a JSObject.  The behavior depends on the value of enum_op:
 *

(-)a/js/src/jsreflect.cpp (-2 / +2 lines)

Line	Link Here

Lines 3173-3179 Class js_ReflectClass = {	Link Here

3173

    PropertyStub,

3173

    PropertyStub,

3174

    PropertyStub,

3174

    PropertyStub,

3175

    PropertyStub,

3175

    PropertyStub,

3176

    PropertyStub,

3176

    StrictPropertyStub,

3177

    EnumerateStub,

3177

    EnumerateStub,

3178

    ResolveStub,

3178

    ResolveStub,

3179

    ConvertStub

3179

    ConvertStub

Lines 3310-3316 js_InitReflectClass(JSContext *cx, JSObj	Link Here

3310

        return NULL;

3310

        return NULL;

3311

3312

    if (!JS_DefineProperty(cx, obj, js_Reflect_str, OBJECT_TO_JSVAL(Reflect),

3312

    if (!JS_DefineProperty(cx, obj, js_Reflect_str, OBJECT_TO_JSVAL(Reflect),

3313

                           JS_PropertyStub, JS_PropertyStub, 0)) {

3313

                           JS_PropertyStub, JS_StrictPropertyStub, 0)) {

3314

        return NULL;

3314

        return NULL;

3315

3316





Class js::regexp_statics_class = {
    "RegExpStatics", 
    JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    resc_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(resc_trace)
};


DEFINE_GETTER(sticky_getter,     *vp = BooleanValue(re->sticky()))

static JSBool
lastIndex_setter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp)
{
    while (obj->getClass() != &js_RegExpClass) {
        obj = obj->getProto();


#define DEFINE_STATIC_SETTER(name, code)                                        \
    static JSBool                                                               \
    name(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)       \
    {                                                                           \
        RegExpStatics *res = cx->regExpStatics();                               \
        code;                                                                   \

    JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::REGEXP_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_RegExp),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    regexp_enumerate,
    reinterpret_cast<JSResolveOp>(regexp_resolve),
    ConvertStub,
    regexp_finalize,
    NULL,                 /* reserved0 */
    NULL,                 /* checkAccess */
    regexp_call,
    NULL,                 /* construct */
    js_XDRRegExpObject,
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(regexp_trace)
};


(-)a/js/src/jsregexpinlines.h (-1 / +1 lines)

Line	Link Here

Lines 215-221 class RegExpMatchBuilder	Link Here

215

216

217

    bool append(jsid id, Value val) {

217

    bool append(jsid id, Value val) {

218

        return !!js_DefineProperty(cx, array, id, &val, js::PropertyStub, js::PropertyStub,

218

        return !!js_DefineProperty(cx, array, id, &val, js::PropertyStub, js::StrictPropertyStub,

219

                                   JSPROP_ENUMERATE);

219

                                   JSPROP_ENUMERATE);

220

221






Shape *
Shape::newDictionaryShapeForAddProperty(JSContext *cx, jsid id,
                                        PropertyOp getter, StrictPropertyOp setter,
                                        uint32 slot, uintN attrs, uintN flags, intN shortid)
{
    Shape *shape = JS_PROPERTY_TREE(cx).newShape(cx);

NormalizeGetterAndSetter(JSContext *cx, JSObject *obj,
                         jsid id, uintN attrs, uintN flags,
                         PropertyOp &getter,
                         StrictPropertyOp &setter)
{
    if (setter == StrictPropertyStub) {
        JS_ASSERT(!(attrs & JSPROP_SETTER));
        setter = NULL;
    }


const Shape *
JSObject::addProperty(JSContext *cx, jsid id,
                      PropertyOp getter, StrictPropertyOp setter,
                      uint32 slot, uintN attrs,
                      uintN flags, intN shortid)
{


const Shape *
JSObject::addPropertyInternal(JSContext *cx, jsid id,
                              PropertyOp getter, StrictPropertyOp setter,
                              uint32 slot, uintN attrs,
                              uintN flags, intN shortid,
                              Shape **spp)


const Shape *
JSObject::putProperty(JSContext *cx, jsid id,
                      PropertyOp getter, StrictPropertyOp setter,
                      uint32 slot, uintN attrs,
                      uintN flags, intN shortid)
{


const Shape *
JSObject::changeProperty(JSContext *cx, const Shape *shape, uintN attrs, uintN mask,
                         PropertyOp getter, StrictPropertyOp setter)
{
    JS_ASSERT_IF(inDictionaryMode(), !lastProp->frozen());
    JS_ASSERT(!JSID_IS_VOID(shape->id));


    if (getter == PropertyStub)
        getter = NULL;
    if (setter == StrictPropertyStub)
        setter = NULL;
    if (shape->attrs == attrs && shape->getter() == getter && shape->setter() == setter)
        return shape;





    };

    union {
        js::StrictPropertyOp  rawSetter;/* getter is JSObject* and setter is 0
                                           if shape->isMethod() */
        JSObject        *setterObj;     /* user-defined callable "set" object or
                                           null if shape->hasSetterValue() */

    static js::Shape *newDictionaryShape(JSContext *cx, const js::Shape &child, js::Shape **listp);
    static js::Shape *newDictionaryList(JSContext *cx, js::Shape **listp);
    static js::Shape *newDictionaryShapeForAddProperty(JSContext *cx, jsid id,
                                                       PropertyOp getter, StrictPropertyOp setter,
                                                       uint32 slot, uintN attrs,
                                                       uintN flags, intN shortid);


        FROZEN          = 0x10
    };

    Shape(jsid id, js::PropertyOp getter, js::StrictPropertyOp setter, uint32 slot, uintN attrs,
          uintN flags, intN shortid, uint32 shape = INVALID_SHAPE, uint32 slotSpan = 0);

    /* Used by EmptyShape (see jsscopeinlines.h). */

        return hasGetterValue() && getterObj ? js::ObjectValue(*getterObj) : js::UndefinedValue();
    }

    js::StrictPropertyOp setter() const { return rawSetter; }
    bool hasDefaultSetter() const  { return !rawSetter; }
    js::StrictPropertyOp setterOp() const { JS_ASSERT(!hasSetterValue()); return rawSetter; }
    JSObject *setterObject() const { JS_ASSERT(hasSetterValue()); return setterObj; }

    // Per ES5, decode null setterObj as the undefined value, which encodes as null.


    inline JSDHashNumber hash() const;
    inline bool matches(const js::Shape *p) const;
    inline bool matchesParamsAfterId(js::PropertyOp agetter, js::StrictPropertyOp asetter,
                                     uint32 aslot, uintN aattrs, uintN aflags,
                                     intN ashortid) const;

    bool get(JSContext* cx, JSObject *receiver, JSObject *obj, JSObject *pobj, js::Value* vp) const;
    bool set(JSContext* cx, JSObject *obj, bool strict, js::Value* vp) const;

    inline bool isSharedPermanent() const;






namespace js {

inline
Shape::Shape(jsid id, js::PropertyOp getter, js::StrictPropertyOp setter, uint32 slot, uintN attrs,
             uintN flags, intN shortid, uint32 shape, uint32 slotSpan)
  : JSObjectMap(shape, slotSpan),
    numSearches(0), table(NULL), id(id), rawGetter(getter), rawSetter(setter), slot(slot),

}

inline bool
Shape::matchesParamsAfterId(js::PropertyOp agetter, js::StrictPropertyOp asetter, uint32 aslot,
                            uintN aattrs, uintN aflags, intN ashortid) const
{
    JS_ASSERT(!JSID_IS_VOID(id));

}

inline bool
Shape::set(JSContext* cx, JSObject* obj, bool strict, js::Value* vp) const
{
    JS_ASSERT_IF(hasDefaultSetter(), hasGetterValue());


    /* See the comment in js::Shape::get as to why we check for With. */
    if (obj->getClass() == &js_WithClass)
        obj = js_UnwrapWithObject(cx, obj);
    return js::CallJSPropertyOpSetter(cx, setterOp(), obj, SHAPE_USERID(this), strict, vp);
}

inline





    uintN attrs = JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED;

    uint16 *indexp;
    PropertyOp getter;
    StrictPropertyOp setter;
    uint32 slot = JSObject::CALL_RESERVED_SLOTS;

    if (kind == ARGUMENT) {

    "Script",
    JSCLASS_HAS_PRIVATE |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_Object),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    script_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(script_trace)
};


(-)a/js/src/jsstr.cpp (-4 / +4 lines)

Line	Link Here

Lines 661-667 str_enumerate(JSContext cx, JSObject o	Link Here

661

        if (!str1)

661

        if (!str1)

662

            return JS_FALSE;

662

            return JS_FALSE;

663

        if (!obj->defineProperty(cx, INT_TO_JSID(i), StringValue(str1),

663

        if (!obj->defineProperty(cx, INT_TO_JSID(i), StringValue(str1),

664

                                 PropertyStub, PropertyStub,

664

                                 PropertyStub, StrictPropertyStub,

665

                                 STRING_ELEMENT_ATTRS)) {

665

                                 STRING_ELEMENT_ATTRS)) {

666

            return JS_FALSE;

666

            return JS_FALSE;

667

Lines 699-708 Class js_StringClass = {	Link Here

699

    js_String_str,

699

    js_String_str,

700

    JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_NEW_RESOLVE |

700

    JSCLASS_HAS_RESERVED_SLOTS(1) | JSCLASS_NEW_RESOLVE |

701

    JSCLASS_HAS_CACHED_PROTO(JSProto_String),

701

    JSCLASS_HAS_CACHED_PROTO(JSProto_String),

702

    PropertyStub,   /* addProperty */

702

    PropertyStub,         /* addProperty */

703

    PropertyStub,   /* delProperty */

703

    PropertyStub,         /* delProperty */

704

    str_getProperty,

704

    str_getProperty,

705

    PropertyStub,   /* setProperty */

705

    StrictPropertyStub,   /* setProperty */

706

    str_enumerate,

706

    str_enumerate,

707

    (JSResolveOp)str_resolve,

707

    (JSResolveOp)str_resolve,

708

    ConvertStub

708

    ConvertStub





    "jitstats",
    0,
    JS_PropertyStub,       JS_PropertyStub,
    jitstats_getProperty,  JS_StrictPropertyStub,
    JS_EnumerateStub,      JS_ResolveStub,
    JS_ConvertStub,        NULL,
    JSCLASS_NO_OPTIONAL_MEMBERS

    w.stStateField(w.immi(1), nativeVpLen);

    CallInfo* ci = new (traceAlloc()) CallInfo();
    /* Setters and getters have their initial arguments in common. */
    LIns* possibleArgs[] = { NULL, NULL, w.immpIdGC(SHAPE_USERID(shape)), obj_ins, cx_ins };
    LIns** args;
    if (setflag) {
        ci->_address = uintptr_t(shape->setterOp());
        ci->_typesig = CallInfo::typeSig5(ARGTYPE_I, ARGTYPE_P, ARGTYPE_P, ARGTYPE_P, ARGTYPE_B,
                                          ARGTYPE_P);
        possibleArgs[0] = addr_boxed_val_ins;
        possibleArgs[1] = strictModeCode_ins;
        args = possibleArgs;
    } else {
        ci->_address = uintptr_t(shape->getterOp());
        ci->_typesig = CallInfo::typeSig4(ARGTYPE_I, ARGTYPE_P, ARGTYPE_P, ARGTYPE_P, ARGTYPE_P);
        possibleArgs[1] = addr_boxed_val_ins;
        args = possibleArgs + 1;
    }
    ci->_isPure = 0;
    ci->_storeAccSet = ACCSET_STORE_ANY;
    ci->_abi = ABI_CDECL;
#ifdef DEBUG
    ci->_name = "JSPropertyOp";
#endif
    LIns* args[] = { addr_boxed_val_ins, w.immpIdGC(SHAPE_USERID(shape)), obj_ins, cx_ins };
    LIns* ok_ins = w.call(ci, args);

    // Cleanup. Immediately clear nativeVp before we might deep bail.


    // See comment in TR::nativeSet about why we do not support setting a
    // property that has both a setter and a slot.
    if (clasp->setProperty != Valueify(JS_StrictPropertyStub))
        RETURN_STOP("set new property with setter and slot");

#ifdef DEBUG






    static JSBool
    obj_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *v,
                       PropertyOp getter, StrictPropertyOp setter, uintN attrs)
    {
        if (JSID_IS_ATOM(id, cx->runtime->atomState.lengthAtom))
            return true;

Class ArrayBuffer::jsclass = {
    "ArrayBuffer",
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_ArrayBuffer),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,

JSPropertySpec ArrayBuffer::jsprops[] = {
    { "byteLength",
      -1, JSPROP_SHARED | JSPROP_PERMANENT | JSPROP_READONLY,
      Jsvalify(ArrayBuffer::prop_getByteLength), JS_StrictPropertyStub },
    {0,0,0,0,0}
};


JSPropertySpec TypedArray::jsprops[] = {
    { js_length_str,
      -1, JSPROP_SHARED | JSPROP_PERMANENT | JSPROP_READONLY,
      Jsvalify(TypedArray::prop_getLength), JS_StrictPropertyStub },
    { "byteLength",
      -1, JSPROP_SHARED | JSPROP_PERMANENT | JSPROP_READONLY,
      Jsvalify(TypedArray::prop_getByteLength), JS_StrictPropertyStub },
    { "byteOffset",
      -1, JSPROP_SHARED | JSPROP_PERMANENT | JSPROP_READONLY,
      Jsvalify(TypedArray::prop_getByteOffset), JS_StrictPropertyStub },
    { "buffer",
      -1, JSPROP_SHARED | JSPROP_PERMANENT | JSPROP_READONLY,
      Jsvalify(TypedArray::prop_getBuffer), JS_StrictPropertyStub },
    {0,0,0,0,0}
};


{                                                                              \
    #_typedArray,                                                              \
    JSCLASS_HAS_PRIVATE | JSCLASS_HAS_CACHED_PROTO(JSProto_##_typedArray),     \
    PropertyStub,         /* addProperty */                                    \
    PropertyStub,         /* delProperty */                                    \
    PropertyStub,         /* getProperty */                                    \
    StrictPropertyStub,   /* setProperty */                                    \
    EnumerateStub,                                                             \
    ResolveStub,                                                               \
    ConvertStub,                                                               \

{                                                                              \
    #_typedArray,                                                              \
    Class::NON_NATIVE | JSCLASS_HAS_PRIVATE,                                   \
    PropertyStub,         /* addProperty */                                    \
    PropertyStub,         /* delProperty */                                    \
    PropertyStub,         /* getProperty */                                    \
    StrictPropertyStub,   /* setProperty */                                    \
    EnumerateStub,                                                             \
    ResolveStub,                                                               \
    ConvertStub,                                                               \

    if (!ctor ||                                                               \
        !JS_DefineProperty(cx, ctor, "BYTES_PER_ELEMENT",                      \
                           INT_TO_JSVAL(sizeof(_typedArray::ThisType)),        \
                           JS_PropertyStub, JS_StrictPropertyStub,             \
                           JSPROP_PERMANENT | JSPROP_READONLY) ||              \
        !JS_DefineProperty(cx, proto, "BYTES_PER_ELEMENT",                     \
                           INT_TO_JSVAL(sizeof(_typedArray::ThisType)),        \
                           JS_PropertyStub, JS_StrictPropertyStub,             \
                           JSPROP_PERMANENT | JSPROP_READONLY))                \
    {                                                                          \
        return NULL;                                                           \

(-)a/js/src/jsvalue.h (-27 / +32 lines)

Line	Link Here

Lines 893-898 typedef JSBool	Link Here

893

typedef JSBool

893

typedef JSBool

894

(* PropertyOp)(JSContext *cx, JSObject *obj, jsid id, Value *vp);

894

(* PropertyOp)(JSContext *cx, JSObject *obj, jsid id, Value *vp);

895

typedef JSBool

895

typedef JSBool

896

(* StrictPropertyOp)(JSContext *cx, JSObject *obj, jsid id, JSBool strict, Value *vp);

897

typedef JSBool

896

(* ConvertOp)(JSContext *cx, JSObject *obj, JSType type, Value *vp);

898

(* ConvertOp)(JSContext *cx, JSObject *obj, JSType type, Value *vp);

897

typedef JSBool

899

typedef JSBool

898

(* NewEnumerateOp)(JSContext *cx, JSObject *obj, JSIterateOp enum_op,

900

(* NewEnumerateOp)(JSContext *cx, JSObject *obj, JSIterateOp enum_op,

Lines 906-912 typedef JSBool	Link Here

906

(* EqualityOp)(JSContext *cx, JSObject *obj, const Value *v, JSBool *bp);

908

(* EqualityOp)(JSContext *cx, JSObject *obj, const Value *v, JSBool *bp);

907

typedef JSBool

909

typedef JSBool

908

(* DefinePropOp)(JSContext *cx, JSObject *obj, jsid id, const Value *value,

910

(* DefinePropOp)(JSContext *cx, JSObject *obj, jsid id, const Value *value,

909

                 PropertyOp getter, PropertyOp setter, uintN attrs);

911

                 PropertyOp getter, StrictPropertyOp setter, uintN attrs);

910

typedef JSBool

912

typedef JSBool

911

(* PropertyIdOp)(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, Value *vp);

913

(* PropertyIdOp)(JSContext *cx, JSObject *obj, JSObject *receiver, jsid id, Value *vp);

912

typedef JSBool

914

typedef JSBool

Lines 941-966 class AutoIdVector;	Link Here

941

typedef JSBool

943

typedef JSBool

942

(* FixOp)(JSContext *cx, JSObject *obj, bool *fixed, AutoIdVector *props);

944

(* FixOp)(JSContext *cx, JSObject *obj, bool *fixed, AutoIdVector *props);

943

945

944

static inline Native            Valueify(JSNative f)          { return (Native)f; }

946

static inline Native             Valueify(JSNative f)           { return (Native)f; }

945

static inline JSNative          Jsvalify(Native f)            { return (JSNative)f; }

947

static inline JSNative           Jsvalify(Native f)             { return (JSNative)f; }

946

static inline PropertyOp        Valueify(JSPropertyOp f)      { return (PropertyOp)f; }

948

static inline PropertyOp         Valueify(JSPropertyOp f)       { return (PropertyOp)f; }

947

static inline JSPropertyOp      Jsvalify(PropertyOp f)        { return (JSPropertyOp)f; }

949

static inline JSPropertyOp       Jsvalify(PropertyOp f)         { return (JSPropertyOp)f; }

948

static inline ConvertOp         Valueify(JSConvertOp f)       { return (ConvertOp)f; }

950

static inline StrictPropertyOp   Valueify(JSStrictPropertyOp f) { return (StrictPropertyOp)f; }

949

static inline JSConvertOp       Jsvalify(ConvertOp f)         { return (JSConvertOp)f; }

951

static inline JSStrictPropertyOp Jsvalify(StrictPropertyOp f)   { return (JSStrictPropertyOp)f; }

950

static inline NewEnumerateOp    Valueify(JSNewEnumerateOp f)  { return (NewEnumerateOp)f; }

952

static inline ConvertOp          Valueify(JSConvertOp f)        { return (ConvertOp)f; }

951

static inline JSNewEnumerateOp  Jsvalify(NewEnumerateOp f)    { return (JSNewEnumerateOp)f; }

953

static inline JSConvertOp        Jsvalify(ConvertOp f)          { return (JSConvertOp)f; }

952

static inline HasInstanceOp     Valueify(JSHasInstanceOp f)   { return (HasInstanceOp)f; }

954

static inline NewEnumerateOp     Valueify(JSNewEnumerateOp f)   { return (NewEnumerateOp)f; }

953

static inline JSHasInstanceOp   Jsvalify(HasInstanceOp f)     { return (JSHasInstanceOp)f; }

955

static inline JSNewEnumerateOp   Jsvalify(NewEnumerateOp f)     { return (JSNewEnumerateOp)f; }

954

static inline CheckAccessOp     Valueify(JSCheckAccessOp f)   { return (CheckAccessOp)f; }

956

static inline HasInstanceOp      Valueify(JSHasInstanceOp f)    { return (HasInstanceOp)f; }

955

static inline JSCheckAccessOp   Jsvalify(CheckAccessOp f)     { return (JSCheckAccessOp)f; }

957

static inline JSHasInstanceOp    Jsvalify(HasInstanceOp f)      { return (JSHasInstanceOp)f; }

956

static inline EqualityOp        Valueify(JSEqualityOp f);     /* Same type as JSHasInstanceOp */

958

static inline CheckAccessOp      Valueify(JSCheckAccessOp f)    { return (CheckAccessOp)f; }

957

static inline JSEqualityOp      Jsvalify(EqualityOp f);       /* Same type as HasInstanceOp */

959

static inline JSCheckAccessOp    Jsvalify(CheckAccessOp f)      { return (JSCheckAccessOp)f; }

960

static inline EqualityOp         Valueify(JSEqualityOp f);      /* Same type as JSHasInstanceOp */

961

static inline JSEqualityOp       Jsvalify(EqualityOp f);        /* Same type as HasInstanceOp */

958

962

959

static const PropertyOp    PropertyStub  = (PropertyOp)JS_PropertyStub;

963

static const PropertyOp       PropertyStub       = (PropertyOp)JS_PropertyStub;

960

static const JSEnumerateOp EnumerateStub = JS_EnumerateStub;

964

static const StrictPropertyOp StrictPropertyStub = (StrictPropertyOp)JS_StrictPropertyStub;

961

static const JSResolveOp   ResolveStub   = JS_ResolveStub;

965

static const JSEnumerateOp    EnumerateStub      = JS_EnumerateStub;

962

static const ConvertOp     ConvertStub   = (ConvertOp)JS_ConvertStub;

966

static const JSResolveOp      ResolveStub        = JS_ResolveStub;

963

static const JSFinalizeOp  FinalizeStub  = JS_FinalizeStub;

967

static const ConvertOp        ConvertStub        = (ConvertOp)JS_ConvertStub;

968

static const JSFinalizeOp     FinalizeStub       = JS_FinalizeStub;

964

969

965

#define JS_CLASS_MEMBERS                                                      \

970

#define JS_CLASS_MEMBERS                                                      \

966

    const char          *name;                                                \

971

    const char          *name;                                                \

Lines 970-976 static const JSFinalizeOp FinalizeStub	Link Here

970

    PropertyOp          addProperty;                                          \

975

    PropertyOp          addProperty;                                          \

971

    PropertyOp          delProperty;                                          \

976

    PropertyOp          delProperty;                                          \

972

    PropertyOp          getProperty;                                          \

977

    PropertyOp          getProperty;                                          \

973

    PropertyOp          setProperty;                                          \

978

    StrictPropertyOp    setProperty;                                          \

974

    JSEnumerateOp       enumerate;                                            \

979

    JSEnumerateOp       enumerate;                                            \

975

    JSResolveOp         resolve;                                              \

980

    JSResolveOp         resolve;                                              \

976

    ConvertOp           convert;                                              \

981

    ConvertOp           convert;                                              \

Lines 1057-1068 JS_STATIC_ASSERT(offsetof(JSClass, mark)	Link Here

1057

JS_STATIC_ASSERT(sizeof(JSClass) == sizeof(Class));

1062

JS_STATIC_ASSERT(sizeof(JSClass) == sizeof(Class));

1058

1063

1059

struct PropertyDescriptor {

1064

struct PropertyDescriptor {

1060

    JSObject     *obj;

1065

    JSObject           *obj;

1061

    uintN        attrs;

1066

    uintN              attrs;

1062

    PropertyOp   getter;

1067

    PropertyOp         getter;

1063

    PropertyOp   setter;

1068

    StrictPropertyOp   setter;

1064

    Value        value;

1069

    Value              value;

1065

    uintN        shortid;

1070

    uintN              shortid;

1066

};

1071

};

1067

JS_STATIC_ASSERT(offsetof(JSPropertyDescriptor, obj) == offsetof(PropertyDescriptor, obj));

1072

JS_STATIC_ASSERT(offsetof(JSPropertyDescriptor, obj) == offsetof(PropertyDescriptor, obj));

1068

JS_STATIC_ASSERT(offsetof(JSPropertyDescriptor, attrs) == offsetof(PropertyDescriptor, attrs));

1073

JS_STATIC_ASSERT(offsetof(JSPropertyDescriptor, attrs) == offsetof(PropertyDescriptor, attrs));





}

bool
JSWrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,
               Value *vp)
{
    // FIXME (bug 596351): Need deal with strict mode.
    SET(wrappedObject(wrapper)->setProperty(cx, id, vp, false));

}

bool
JSCrossCompartmentWrapper::set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id,
                               bool strict, Value *vp)
{
    AutoValueRooter tvr(cx, *vp);
    PIERCE(cx, wrapper, SET,
           call.destination->wrap(cx, &receiver) &&
           call.destination->wrapId(cx, &id) &&
           call.destination->wrap(cx, tvr.addr()),
           JSWrapper::set(cx, wrapper, receiver, id, strict, tvr.addr()),
           NOTHING);
}


(-)a/js/src/jswrapper.h (-2 / +4 lines)

Line	Link Here

Lines 75-81 class JS_FRIEND_API(JSWrapper) : public	Link Here

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,

                     js::Value *vp);

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

    virtual bool iterate(JSContext *cx, JSObject *wrapper, uintN flags, js::Value *vp);

    virtual bool iterate(JSContext *cx, JSObject *wrapper, uintN flags, js::Value *vp);

Lines 137-143 class JS_FRIEND_API(JSCrossCompartmentWr	Link Here

137

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

138

    virtual bool has(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

138

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

139

    virtual bool hasOwn(JSContext *cx, JSObject *wrapper, jsid id, bool *bp);

139

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

140

    virtual bool get(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

140

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, js::Value *vp);

141

    virtual bool set(JSContext *cx, JSObject *wrapper, JSObject *receiver, jsid id, bool strict,

142

                     js::Value *vp);

141

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

143

    virtual bool keys(JSContext *cx, JSObject *wrapper, js::AutoIdVector &props);

142

    virtual bool iterate(JSContext *cx, JSObject *wrapper, uintN flags, js::Value *vp);

144

    virtual bool iterate(JSContext *cx, JSObject *wrapper, uintN flags, js::Value *vp);

143

145





    JSCLASS_CONSTRUCT_PROTOTYPE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::NAMESPACE_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_Namespace),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    FinalizeStub,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    NULL,                 /* mark        */
    {
        namespace_equality,
        NULL,             /* outerObject    */
        NULL,             /* innerObject    */
        NULL,             /* iteratorObject */
        NULL,             /* wrappedObject  */
    }
};


    JSCLASS_CONSTRUCT_PROTOTYPE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::QNAME_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_HAS_CACHED_PROTO(JSProto_QName),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    FinalizeStub,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    NULL,                 /* mark        */
    {
        qname_equality,
        NULL,             /* outerObject    */
        NULL,             /* innerObject    */
        NULL,             /* iteratorObject */
        NULL,             /* wrappedObject  */
    }
};


    JSCLASS_CONSTRUCT_PROTOTYPE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::QNAME_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_IS_ANONYMOUS,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,

    JSCLASS_CONSTRUCT_PROTOTYPE |
    JSCLASS_HAS_RESERVED_SLOTS(JSObject::QNAME_CLASS_RESERVED_SLOTS) |
    JSCLASS_MARK_IS_TRACE | JSCLASS_IS_ANONYMOUS,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,


/* ECMA-357 9.1.1.2 XML [[Put]] and 9.2.1.2 XMLList [[Put]]. */
static JSBool
PutProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    JSBool ok, primitiveAssign;
    enum { OBJ_ROOT, ID_ROOT, VAL_ROOT };

                parentobj = js_GetXMLObject(cx, parent);
                if (!parentobj)
                    goto bad;
                ok = PutProperty(cx, parentobj, id, strict, vp);
                if (!ok)
                    goto out;


            if (!kidobj)
                goto bad;
            id = ATOM_TO_JSID(cx->runtime->atomState.starAtom);
            ok = PutProperty(cx, kidobj, id, strict, vp);
            if (!ok)
                goto out;
        }

            return JS_TRUE;
        }
        tv = STRING_TO_JSVAL(cx->runtime->emptyString);
        if (!PutProperty(cx, base->object, id, false, &tv))
            return JS_FALSE;
        if (!GetProperty(cx, base->object, id, &tv))
            return JS_FALSE;


static JSBool
xml_defineProperty(JSContext *cx, JSObject *obj, jsid id, const Value *v,
                   PropertyOp getter, StrictPropertyOp setter, uintN attrs)
{
    if (IsFunctionObject(*v) || getter || setter ||
        (attrs & JSPROP_ENUMERATE) == 0 ||

    }

    jsval tmp = Jsvalify(*v);
    return PutProperty(cx, obj, id, false, &tmp);
}

static JSBool

static JSBool
xml_setProperty(JSContext *cx, JSObject *obj, jsid id, Value *vp, JSBool strict)
{
    return PutProperty(cx, obj, id, strict, Jsvalify(vp));
}

static JSBool

    js_XML_str,
    JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE |
    JSCLASS_HAS_CACHED_PROTO(JSProto_XML),
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    xml_convert,
    xml_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    xml_hasInstance,
    JS_CLASS_TRACE(xml_trace),
    JS_NULL_CLASS_EXT,

        return JS_FALSE;
    *vp = (argc != 0) ? vp[2] : JSVAL_VOID;

    if (!PutProperty(cx, JSVAL_TO_OBJECT(v), name, false, vp))
        return JS_FALSE;

    *vp = OBJECT_TO_JSVAL(obj);

        return JS_FALSE;

    *vp = argc != 0 ? vp[2] : JSVAL_VOID;     /* local root */
    if (!PutProperty(cx, obj, ATOM_TO_JSID(cx->runtime->atomState.starAtom), false, vp))
        return JS_FALSE;

    *vp = OBJECT_TO_JSVAL(obj);

        return JS_FALSE;
    v = OBJECT_TO_JSVAL(ns);
    if (!obj->defineProperty(cx, JS_DEFAULT_XML_NAMESPACE_ID, Valueify(v),
                             PropertyStub, StrictPropertyStub, JSPROP_PERMANENT)) {
        return JS_FALSE;
    }
    *vp = v;

    JSStackFrame *fp = js_GetTopStackFrame(cx);
    JSObject &varobj = fp->varobj(cx);
    if (!varobj.defineProperty(cx, JS_DEFAULT_XML_NAMESPACE_ID, ObjectValue(*ns),
                               PropertyStub, StrictPropertyStub, JSPROP_PERMANENT)) {
        return JS_FALSE;
    }
    return JS_TRUE;

Class js_XMLFilterClass = {
    "XMLFilter",
    JSCLASS_HAS_PRIVATE | JSCLASS_IS_ANONYMOUS | JSCLASS_MARK_IS_TRACE,
    PropertyStub,         /* addProperty */
    PropertyStub,         /* delProperty */
    PropertyStub,         /* getProperty */
    StrictPropertyStub,   /* setProperty */
    EnumerateStub,
    ResolveStub,
    ConvertStub,
    xmlfilter_finalize,
    NULL,                 /* reserved0   */
    NULL,                 /* checkAccess */
    NULL,                 /* call        */
    NULL,                 /* construct   */
    NULL,                 /* xdrObject   */
    NULL,                 /* hasInstance */
    JS_CLASS_TRACE(xmlfilter_trace)
};


(-)a/js/src/methodjit/PolyIC.cpp (-1 / +1 lines)

Line	Link Here

Lines 485-491 class SetPropCompiler : public PICStubCo	Link Here

485

486

        Class *clasp = obj->getClass();

486

        Class *clasp = obj->getClass();

487

488

        if (clasp->setProperty != PropertyStub)

488

        if (clasp->setProperty != StrictPropertyStub)

489

            return disable("set property hook");

489

            return disable("set property hook");

490

        if (clasp->ops.lookupProperty)

490

        if (clasp->ops.lookupProperty)

491

            return disable("ops lookup property hook");

491

            return disable("ops lookup property hook");

(-)a/js/src/methodjit/StubCalls-inl.h (-2 / +2 lines)

Line	Link Here

Lines 70-76 ReportAtomNotDefined(JSContext *cx, JSAt	Link Here

        js_ReportIsNotDefined(cx, printable.ptr());

        js_ReportIsNotDefined(cx, printable.ptr());

#define NATIVE_SET(cx,obj,shape,entry,vp)                                     \

#define NATIVE_SET(cx,obj,shape,entry,strict,vp)                              \

    JS_BEGIN_MACRO                                                            \

    JS_BEGIN_MACRO                                                            \

        if (shape->hasDefaultSetter() &&                                      \

        if (shape->hasDefaultSetter() &&                                      \

            (shape)->slot != SHAPE_INVALID_SLOT &&                            \

            (shape)->slot != SHAPE_INVALID_SLOT &&                            \

Lines 78-84 ReportAtomNotDefined(JSContext *cx, JSAt	Link Here

            /* Fast path for, e.g., plain Object instance properties. */      \

            /* Fast path for, e.g., plain Object instance properties. */      \

            (obj)->nativeSetSlot((shape)->slot, *vp);                         \

            (obj)->nativeSetSlot((shape)->slot, *vp);                         \

        } else {                                                              \

        } else {                                                              \

            if (!js_NativeSet(cx, obj, shape, false, vp))                     \

            if (!js_NativeSet(cx, obj, shape, false, strict, vp))             \

                THROW();                                                      \

                THROW();                                                      \

        }                                                                     \

        }                                                                     \

    JS_END_MACRO

    JS_END_MACRO






                    PCMETER(cache->pchits++);
                    PCMETER(cache->setpchits++);
                    NATIVE_SET(cx, obj, shape, entry, strict, &rval);
                    break;
                }
            } else {

    do {
        /* Steps 5d, 5f. */
        if (!prop || pobj != parent) {
            if (!parent->defineProperty(cx, id, rval, PropertyStub, StrictPropertyStub, attrs))
                THROW();
            break;
        }

        Shape *shape = reinterpret_cast<Shape *>(prop);
        if (parent->isGlobal()) {
            if (shape->configurable()) {
                if (!parent->defineProperty(cx, id, rval, PropertyStub, StrictPropertyStub, attrs))
                    THROW();
                break;
            }


    /* Bind a variable only if it's not yet defined. */
    if (!prop) {
        if (!js_DefineNativeProperty(cx, obj, id, UndefinedValue(),
                                     PropertyStub, StrictPropertyStub, attrs, 0, 0, &prop)) {
            THROW();
        }
        JS_ASSERT(prop);

    JSObject *obj = &fp->varobj(cx);
    const Value &ref = f.regs.sp[-1];
    if (!obj->defineProperty(cx, ATOM_TO_JSID(atom), ref,
                             PropertyStub, StrictPropertyStub,
                             JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY)) {
        THROW();
    }

(-)a/js/src/perf/jsperf.cpp (-2 / +2 lines)

Line	Link Here

Lines 216-222 static const struct pm_const {	Link Here

216

217

static JSClass pm_class = {

217

static JSClass pm_class = {

218

    "PerfMeasurement", JSCLASS_HAS_PRIVATE,

218

    "PerfMeasurement", JSCLASS_HAS_PRIVATE,

219

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

219

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

220

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, pm_finalize,

220

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, pm_finalize,

221

    JSCLASS_NO_OPTIONAL_MEMBERS

221

    JSCLASS_NO_OPTIONAL_MEMBERS

222

};

222

};

Lines 265-271 RegisterPerfMeasurement(JSContext *cx, J	Link Here

265

266

    for (const pm_const *c = pm_consts; c->name; c++) {

266

    for (const pm_const *c = pm_consts; c->name; c++) {

267

        if (!JS_DefineProperty(cx, ctor, c->name, INT_TO_JSVAL(c->value),

267

        if (!JS_DefineProperty(cx, ctor, c->name, INT_TO_JSVAL(c->value),

268

                               JS_PropertyStub, JS_PropertyStub, PM_CATTRS))

268

                               JS_PropertyStub, JS_StrictPropertyStub, PM_CATTRS))

269

            return 0;

269

            return 0;

270

271






static JSClass FinalizeCounterClass = {
    "FinalizeCounter", JSCLASS_IS_ANONYMOUS,
    JS_PropertyStub,       /* addProperty */
    JS_PropertyStub,       /* delProperty */
    JS_PropertyStub,       /* getProperty */
    JS_StrictPropertyStub, /* setProperty */
    JS_EnumerateStub,
    JS_ResolveStub,
    JS_ConvertStub,

}

static JSBool
split_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    ComplexObject *cpx;


    "sandbox",
    JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS,
    JS_PropertyStub,   JS_PropertyStub,
    JS_PropertyStub,   JS_StrictPropertyStub,
    sandbox_enumerate, (JSResolveOp)sandbox_resolve,
    JS_ConvertStub,    NULL,
    JSCLASS_NO_OPTIONAL_MEMBERS

}

static JSBool
its_setter(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
  jsval *val = (jsval *) JS_GetPrivate(cx, obj);
  if (val) {

}

static JSBool
its_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
    IdToString idString(cx, id);
    if (its_noisy) {

JSClass global_class = {
    "global", JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS | JSCLASS_HAS_PRIVATE,
    JS_PropertyStub,  JS_PropertyStub,
    JS_PropertyStub,  JS_StrictPropertyStub,
    global_enumerate, (JSResolveOp) global_resolve,
    JS_ConvertStub,   its_finalize,
    JSCLASS_NO_OPTIONAL_MEMBERS
};

static JSBool
env_setProperty(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{
/* XXX porting may be easy, but these don't seem to supply setenv by default */
#if !defined XP_BEOS && !defined XP_OS2 && !defined SOLARIS

(-)a/js/src/jsapi.h (-6 / +6 lines)

Line	Link Here

Lines 2268-2279 JS_LookupPropertyWithFlagsById(JSContext	Link Here

2268

                               uintN flags, JSObject **objp, jsval *vp);

2268

                               uintN flags, JSObject **objp, jsval *vp);

2269

2270

struct JSPropertyDescriptor {

2270

struct JSPropertyDescriptor {

2271

    JSObject     *obj;

2271

    JSObject           *obj;

2272

    uintN        attrs;

2272

    uintN              attrs;

2273

    JSPropertyOp getter;

2273

    JSPropertyOp       getter;

2274

    JSPropertyOp setter;

2274

    JSStrictPropertyOp setter;

2275

    jsval        value;

2275

    jsval              value;

2276

    uintN        shortid;

2276

    uintN              shortid;

2277

};

2277

};

2278

2279

/*

2279

/*

(-)a/js/src/jsobj.cpp (-1 / +1 lines)

Line	Link Here

Lines 6528-6534 js_ReportGetterOnlyAssignment(JSContext	Link Here

6528

6529

6530

JS_FRIEND_API(JSBool)

6530

JS_FRIEND_API(JSBool)

6531

js_GetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp)

6531

js_GetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp)

6532

6533

    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_GETTER_ONLY);

6533

    JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_GETTER_ONLY);

6534

    return JS_FALSE;

6534

    return JS_FALSE;

(-)a/js/src/jsobj.h (-1 / +7 lines)

Line	Link Here

Lines 92-97 CastAsJSPropertyOp(JSObject *object)	Link Here

    return JS_DATA_TO_FUNC_PTR(JSPropertyOp, object);

    return JS_DATA_TO_FUNC_PTR(JSPropertyOp, object);

static inline JSStrictPropertyOp

CastAsJSStrictPropertyOp(JSObject *object)

    return JS_DATA_TO_FUNC_PTR(JSStrictPropertyOp, object);

100

inline JSObject *

101

inline JSObject *

CastAsObject(PropertyOp op)

102

CastAsObject(PropertyOp op)

103

Lines 1845-1851 extern JSBool	Link Here

1845

js_ReportGetterOnlyAssignment(JSContext *cx);

1851

js_ReportGetterOnlyAssignment(JSContext *cx);

1846

1852

1847

extern JS_FRIEND_API(JSBool)

1853

extern JS_FRIEND_API(JSBool)

1848

js_GetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, jsval *vp);

1854

js_GetterOnlyPropertyStub(JSContext *cx, JSObject *obj, jsid id, JSBool strict, jsval *vp);

1849

1855

1850

#ifdef DEBUG

1856

#ifdef DEBUG

1851

JS_FRIEND_API(void) js_DumpChars(const jschar *s, size_t n);

1857

JS_FRIEND_API(void) js_DumpChars(const jschar *s, size_t n);

(-)a/js/src/shell/jsworkers.cpp (-2 / +2 lines)

Line	Link Here

Lines 1237-1243 Event::trace(JSTracer *trc)	Link Here

1237

1238

JSClass ThreadPool::jsClass = {

1238

JSClass ThreadPool::jsClass = {

1239

    "ThreadPool", JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE,

1239

    "ThreadPool", JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE,

1240

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

1240

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

1241

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,

1241

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,

1242

    NULL, NULL, NULL, NULL,

1242

    NULL, NULL, NULL, NULL,

1243

    NULL, NULL, JS_CLASS_TRACE(jsTraceThreadPool), NULL

1243

    NULL, NULL, JS_CLASS_TRACE(jsTraceThreadPool), NULL

Lines 1245-1251 JSClass ThreadPool::jsClass = {	Link Here

1245

1246

JSClass Worker::jsWorkerClass = {

1246

JSClass Worker::jsWorkerClass = {

1247

    "Worker", JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE,

1247

    "Worker", JSCLASS_HAS_PRIVATE | JSCLASS_MARK_IS_TRACE,

1248

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,

1248

    JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,

1249

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,

1249

    JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, jsFinalize,

1250

    NULL, NULL, NULL, NULL,

1250

    NULL, NULL, NULL, NULL,

1251

    NULL, NULL, JS_CLASS_TRACE(jsTraceWorker), NULL

1251

    NULL, NULL, JS_CLASS_TRACE(jsTraceWorker), NULL

Return to bug 537873