Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 14:15:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 564577 - __noSuchMethod__ no longer invoked for defined non-function properties (r=igor)

Browse Source
This commit is contained in:
Matthew Draper 2011-04-22 04:38:24 +09:30
parent 6651742a72
commit fd6f614374
5 changed files with 86 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsinterp.cpp
View File

@ -4198,7 +4198,7 @@ BEGIN_CASE(JSOP_CALLPROP)
}
}
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
LOAD_ATOM(0, atom);
regs.sp[-2].setString(atom);
if (!js_OnUnknownMethod(cx, regs.sp - 2))
@ -4458,7 +4458,7 @@ BEGIN_CASE(JSOP_CALLELEM)
goto error;
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(regs.sp[-2].isUndefined()) && thisv.isObject()) {
if (JS_UNLIKELY(regs.sp[-2].isPrimitive()) && thisv.isObject()) {
/* For js_OnUnknownMethod, sp[-2] is the index, and sp[-1] is the object missing it. */
regs.sp[-2] = regs.sp[-1];
regs.sp[-1].setObject(*thisObj);

4
js/src/methodjit/PolyIC.cpp
View File

@ -1850,7 +1850,7 @@ ic::CallProp(VMFrame &f, ic::PICInfo *pic)
}
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
regs.sp[-2].setString(pic->atom);
if (!js_OnUnknownMethod(cx, regs.sp - 2))
THROW();
@ -2369,7 +2369,7 @@ ic::CallElement(VMFrame &f, ic::GetElementIC *ic)
THROW();
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(f.regs.sp[-2].isUndefined()) && thisv.isObject()) {
if (JS_UNLIKELY(f.regs.sp[-2].isPrimitive()) && thisv.isObject()) {
f.regs.sp[-2] = f.regs.sp[-1];
f.regs.sp[-1].setObject(*thisObj);
if (!js_OnUnknownMethod(cx, f.regs.sp - 2))

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

@ -514,7 +514,7 @@ stubs::CallElem(VMFrame &f)
THROW();
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(regs.sp[-2].isUndefined()) && thisv.isObject()) {
if (JS_UNLIKELY(regs.sp[-2].isPrimitive()) && thisv.isObject()) {
regs.sp[-2] = regs.sp[-1];
regs.sp[-1].setObject(*thisObj);
if (!js_OnUnknownMethod(cx, regs.sp - 2))
@ -1994,7 +1994,7 @@ stubs::CallProp(VMFrame &f, JSAtom *origAtom)
}
}
#if JS_HAS_NO_SUCH_METHOD
if (JS_UNLIKELY(rval.isUndefined()) && regs.sp[-1].isObject()) {
if (JS_UNLIKELY(rval.isPrimitive()) && regs.sp[-1].isObject()) {
regs.sp[-2].setString(origAtom);
if (!js_OnUnknownMethod(cx, regs.sp - 2))
THROW();

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

@ -223,3 +223,4 @@ script scope-001.js
fails-if(Android) script toLocaleFormat-01.js
fails-if(xulRuntime.OS=="WINNT") script toLocaleFormat-02.js
script regress-543839.js
script regress-564577.js

79
js/src/tests/js1_5/extensions/regress-564577.js Normal file
View File

@ -0,0 +1,79 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/*
* Any copyright is dedicated to the Public Domain.
* http://creativecommons.org/licenses/publicdomain/
* Contributor: Matthew Draper <matthew@trebex.net>
*/
var gTestfile = 'regress-564577.js';
//-----------------------------------------------------------------------------
var BUGNUMBER = 564577;
var summary = '__noSuchMethod__ when property exists';
var actual = '';
var expect = '';
//-----------------------------------------------------------------------------
test();
//-----------------------------------------------------------------------------
function test()
{
enterFunc ('test');
printBugNumber(BUGNUMBER);
printStatus (summary);
var o = {
aaa: undefined,
bbb: null,
ccc: 77,
ddd: 'foo',
eee: {},
fff: /./,
__noSuchMethod__: function (id, args)
{
return(id + '('+args.join(',')+') ' + this[id]);
}
};
status = summary + ' ' + inSection(1) + ' ';
actual = o.aaa();
expect = 'aaa() undefined';
reportCompare(expect, actual, status);
status = summary + ' ' + inSection(2) + ' ';
actual = o.bbb();
expect = 'bbb() null';
reportCompare(expect, actual, status);
status = summary + ' ' + inSection(3) + ' ';
actual = o.ccc();
expect = 'ccc() 77';
reportCompare(expect, actual, status);
status = summary + ' ' + inSection(4) + ' ';
actual = o.ddd();
expect = 'ddd() foo';
reportCompare(expect, actual, status);
status = summary + ' ' + inSection(5) + ' ';
try {
actual = o.eee();
} catch(e) {
actual = e + '';
}
expect = 'TypeError: o.eee is not a function';
reportCompare(expect, actual, status);
status = summary + ' ' + inSection(6) + ' ';
try {
actual = o.fff('xyz') + '';
} catch(e) {
actual = e + '';
}
expect = 'TypeError: o.fff is not a function';
reportCompare(expect, actual, status);
exitFunc('test');
}