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

Merge

Browse Source
This commit is contained in:
Robert Sayre 2010-05-24 13:24:52 -07:00
commit 5f6f628e47
4 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/src/jsapi.cpp
View File

@ -3175,11 +3175,16 @@ GetPropertyAttributesById(JSContext *cx, JSObject *obj, jsid id, uintN flags,
if (obj2->isNative()) {
JSScopeProperty *sprop = (JSScopeProperty *) prop;
desc->getter = sprop->getter();
desc->setter = sprop->setter();
desc->value = SPROP_HAS_VALID_SLOT(sprop, obj2->scope())
? obj2->lockedGetSlot(sprop->slot)
: JSVAL_VOID;
if (sprop->isMethod()) {
desc->getter = desc->setter = JS_PropertyStub;
desc->value = sprop->methodValue();
} else {
desc->getter = sprop->getter();
desc->setter = sprop->setter();
desc->value = SPROP_HAS_VALID_SLOT(sprop, obj2->scope())
? obj2->lockedGetSlot(sprop->slot)
: JSVAL_VOID;
}
} else {
if (obj->isProxy()) {
JSAutoResolveFlags rf(cx, flags);

12
js/src/jsobj.cpp
View File

@ -2302,8 +2302,13 @@ DefinePropertyOnObject(JSContext *cx, JSObject *obj, const PropertyDescriptor &d
changed |= JSPROP_ENUMERATE;
attrs = (sprop->attributes() & ~changed) | (desc.attrs & changed);
getter = sprop->getter();
setter = sprop->setter();
if (sprop->isMethod()) {
JS_ASSERT(!(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
getter = setter = JS_PropertyStub;
} else {
getter = sprop->getter();
setter = sprop->setter();
}
} else if (desc.isDataDescriptor()) {
uintN unchanged = 0;
if (!desc.hasConfigurable)
@ -2343,10 +2348,11 @@ DefinePropertyOnObject(JSContext *cx, JSObject *obj, const PropertyDescriptor &d
changed |= JSPROP_SETTER | JSPROP_SHARED;
attrs = (desc.attrs & changed) | (sprop->attributes() & ~changed);
JS_ASSERT_IF(sprop->isMethod(), !(attrs & (JSPROP_GETTER | JSPROP_SETTER)));
if (desc.hasGet) {
getter = desc.getter();
} else {
getter = (sprop->hasDefaultGetter() && !sprop->hasGetterValue())
getter = (sprop->isMethod() || (sprop->hasDefaultGetter() && !sprop->hasGetterValue()))
? JS_PropertyStub
: sprop->getter();
}

1
js/src/tests/ecma_5/extensions/jstests.list
View File

@ -1,3 +1,4 @@
url-prefix ../../jsreftest.html?test=ecma_5/extensions/
script string-literal-getter-setter-decompilation.js
script 8.12.5-01.js
script regress-bug567606.js

17
js/src/tests/ecma_5/extensions/regress-bug567606.js Normal file
View File

@ -0,0 +1,17 @@
// Any copyright is dedicated to the Public Domain.
// http://creativecommons.org/licenses/publicdomain/
(function() {
function f() {
this.b = function() {};
Object.defineProperty(this, "b", ({
configurable: __defineSetter__("", function() {})
}));
}
for each(y in [0]) {
_ = new f();
}
})();
uneval(this);
reportCompare(true, true);