Backed out changeset 975b36c50d33; bug 478047's fix was misguided and contra ES5, and moving to ES5 semantics at this late date in the release cycle seems unwise. We'll move from old and busted directly to ES5 shortly after 3.6 so as to provide maximum time for ironing out incompatibilities in the wild. r=gal

This commit is contained in:
Jeff Walden 2009-11-16 17:21:48 -08:00
parent f391d8a4f0
commit 05bcc1bbb2
5 changed files with 8 additions and 125 deletions

View File

@ -4355,16 +4355,10 @@ js_NativeSet(JSContext *cx, JSObject *obj, JSScopeProperty *sprop, bool added,
* Allow API consumers to create shared properties with stub setters.
* Such properties lack value storage, so setting them is like writing
* to /dev/null.
*
* But we can't short-circuit if there's a scripted getter or setter
* since we might need to throw. In that case, we let SPROP_SET
* decide whether to throw an exception. See bug 478047.
*/
if (!(sprop->attrs & JSPROP_GETTER) && SPROP_HAS_STUB_SETTER(sprop)) {
JS_ASSERT(!(sprop->attrs & JSPROP_SETTER));
if (SPROP_HAS_STUB_SETTER(sprop))
return true;
}
}
sample = cx->runtime->propertyRemovals;
JS_UNLOCK_SCOPE(cx, scope);

View File

@ -1,2 +1 @@
url-prefix ../../jsreftest.html?test=ecma_3_1/extensions/
script regress-478047.js

View File

@ -1,87 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is JavaScript Engine testing utilities.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s): Norris Boyd
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
var gTestfile = 'regress-478047.js';
//-----------------------------------------------------------------------------
var BUGNUMBER = 478047;
var summary = 'Assign to property with getter but no setter should throw ' +
'TypeError';
var actual = '';
var expect = '';
//-----------------------------------------------------------------------------
test();
//-----------------------------------------------------------------------------
function test()
{
enterFunc ('test');
printBugNumber(BUGNUMBER);
printStatus (summary);
expect = 'TypeError: setting a property that has only a getter';
try
{
var o = { get p() { return "a"; } };
o.p = "b";
}
catch(ex)
{
actual = ex + '';
}
reportCompare(expect, actual, summary);
actual = '';
try
{
o = { get p() { return "a"; } };
T = (function () {});
T.prototype = o;
y = new T();
y.p = "b";
}
catch(ex)
{
actual = ex + '';
}
reportCompare(expect, actual, summary);
exitFunc ('test');
}

View File

@ -54,16 +54,7 @@ function test()
jit(true);
expect = 'TypeError: setting a property that has only a getter';
try
{
q getter= function(){}; for (var j = 0; j < 4; ++j) q = 1;
}
catch(ex)
{
actual = ex + '';
}
jit(false);

View File

@ -59,28 +59,14 @@ reportCompare("3|54|1|", actual, "forEach");
actual = a.join(' - ');
reportCompare("3 - 54 - 1", actual, "join");
try
{
actual = String(a.sort());
}
catch(ex)
{
actual = ex + '';
}
reportCompare("TypeError: setting a property that has only a getter", actual, "sort");
actual = String(a.sort());
reportCompare("1,54,54", actual, "sort");
try
{
a[2]=3;
}
catch(ex)
{
actual = ex + '';
}
reportCompare("TypeError: setting a property that has only a getter", actual, "setter");
a[2]=3;
reportCompare(actual, "1,54,54", "setter");
actual = a.pop();
reportCompare(3, actual, "pop");
reportCompare(actual, 3, "pop");
actual = a.pop();
reportCompare(54, actual, "pop 2");
reportCompare(actual, 54, "pop 2");