554203 - dead code in JSOP_STOP

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Luke Wagner [:luke]]

JSOP_STOP contains the test:

    if ((regs.f.p->flags & JSFRAME_CONSTRUCTING) &&
        JSVAL_IS_PRIMITIVE(regs.f.p->rval)) {
        if (!regs.f.p->fun) {
            JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
                                 JSMSG_BAD_NEW_RESULT,
                                 js_ValueToPrintableString(cx, rval));
            goto error;
        }

It doesn't seem to be possible to have a constructor call that has fp->fun == NULL, in which case the inner test can be removed.  If, for some arcane reason, this is possible, then I think the use of 'rval' should be 'fp->rval'.

Comment 1

[Luke Wagner [:luke]]

Oh, I forgot, this code was introduced for bug 453462.

Comment 2

[Brendan Eich [:brendan]]

I did the hg archeology, and of course I'm blamed for the r+ on Andreas's patch for bug 453462. It seems the rval clamping (primitive trumped by |this| for a ctor) is good but not the if (!fp->fun) error return case. I should have caught that then.

/be

Comment 3

[Luke Wagner [:luke]]

Attachment: remove

Comment 4

[Brendan Eich [:brendan]]

Comment on attachment 434165 [details] [diff] [review]
remove

Looks like you can pull the if condition's overflow line up so it fits on one line and eliminate the braces.

/be

Comment 5

[Luke Wagner [:luke]]

Thanks!
http://hg.mozilla.org/tracemonkey/rev/776508642f39

Comment 6

[Robert Sayre]

http://hg.mozilla.org/mozilla-central/rev/776508642f39