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

Bug 599009. Don't use setProperty for JSOP_DEFFUN unless there's already a property with that name around, to work around the fact that setProperty will define with class-default getter and setter while we always want to define with stub getter and setter if we can. r=igor

Browse Source
This commit is contained in:
Boris Zbarsky 2010-10-07 09:18:53 -04:00
parent e0377cb0a6
commit 4ebf2b027a
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
js/src/jsinterp.cpp
View File

@ -5367,24 +5367,25 @@ BEGIN_CASE(JSOP_DEFFUN)
/*
* We deviate from 10.1.2 in ECMA 262 v3 and under eval use for function
* declarations JSObject::setProperty, not JSObject::defineProperty, to
* preserve the JSOP_PERMANENT attribute of existing properties and make
* sure that such properties cannot be deleted.
* declarations JSObject::setProperty, not JSObject::defineProperty if the
* property already exists, to preserve the JSOP_PERMANENT attribute of
* existing properties and make sure that such properties cannot be deleted.
*
* We also use JSObject::setProperty for the existing properties of Call
* objects with matching attributes to preserve the native getters and
* setters that store the value of the property in the interpreter frame,
* see bug 467495.
*/
uint32 old;
bool doSet = (attrs == JSPROP_ENUMERATE);
JS_ASSERT_IF(doSet, regs.fp->isEvalFrame());
bool doSet = false;
if (prop) {
if (parent == pobj &&
parent->isCall() &&
(old = ((Shape *) prop)->attributes(),
!(old & (JSPROP_GETTER|JSPROP_SETTER)) &&
(old & (JSPROP_ENUMERATE|JSPROP_PERMANENT)) == attrs)) {
JS_ASSERT((attrs == JSPROP_ENUMERATE) == regs.fp->isEvalFrame());
uint32 old;
if (attrs == JSPROP_ENUMERATE ||
(parent == pobj &&
parent->isCall() &&
(old = ((Shape *) prop)->attributes(),
!(old & (JSPROP_GETTER|JSPROP_SETTER)) &&
(old & (JSPROP_ENUMERATE|JSPROP_PERMANENT)) == attrs))) {
/*
* js_CheckRedeclaration must reject attempts to add a getter or
* setter to an existing property without a getter or setter.

21
js/src/methodjit/StubCalls.cpp
View File

@ -931,23 +931,24 @@ stubs::DefFun(VMFrame &f, JSFunction *fun)
/*
* We deviate from 10.1.2 in ECMA 262 v3 and under eval use for function
* declarations JSObject::setProperty, not JSObject::defineProperty, to
* preserve the JSOP_PERMANENT attribute of existing properties and make
* sure that such properties cannot be deleted.
* declarations JSObject::setProperty, not JSObject::defineProperty if the
* property already exists, to preserve the JSOP_PERMANENT attribute of
* existing properties and make sure that such properties cannot be deleted.
*
* We also use JSObject::setProperty for the existing properties of Call
* objects with matching attributes to preserve the native getters and
* setters that store the value of the property in the interpreter frame,
* see bug 467495.
*/
doSet = (attrs == JSPROP_ENUMERATE);
JS_ASSERT_IF(doSet, fp->isEvalFrame());
doSet = false;
if (prop) {
if (parent == pobj &&
parent->isCall() &&
(old = ((Shape *) prop)->attributes(),
!(old & (JSPROP_GETTER|JSPROP_SETTER)) &&
(old & (JSPROP_ENUMERATE|JSPROP_PERMANENT)) == attrs)) {
JS_ASSERT((attrs == JSPROP_PERMANENT) == fp->isEvalFrame());
if (attrs == JSPROP_ENUMERATE ||
(parent == pobj &&
parent->isCall() &&
(old = ((Shape *) prop)->attributes(),
!(old & (JSPROP_GETTER|JSPROP_SETTER)) &&
(old & (JSPROP_ENUMERATE|JSPROP_PERMANENT)) == attrs))) {
/*
* js_CheckRedeclaration must reject attempts to add a getter or
* setter to an existing property without a getter or setter.