Blake Kaplan (:mrbkap) (inactive) Assignee
	Description • 15 years ago

      No description provided.

	Blake Kaplan (:mrbkap) (inactive) Assignee
	Comment 2 • 15 years ago

http://hg.mozilla.org/tracemonkey/rev/bc8bbb513d4e

	David Baron :dbaron:
	Comment 3 • 15 years ago

For what it's worth, this assertion is currently causing crashes running mochitest-browser-chrome on mozilla-central debug builds.  We're hitting a case where fp->regs is null, which means that we dereference null trying to evaluate the assertion that this patch removed:

            if (fp->regs && fp->regs->sp) {
                nslots = (uintN) (fp->regs->sp - fp->slots);
                JS_ASSERT(nslots >= fp->script->nfixed);
            } else {
                nslots = fp->script->nfixed;
                JS_ASSERT_IF(!fp->regs->sp, nslots == 0);
            }

	Mike Shaver (:shaver -- probably not reading bugmail closely)
	Comment 4 • 15 years ago

Yeah, let's get it merged soon.  I wonder if people need to do their own merges for small/key stuff in addition to the more structured merges that sayrer does?

	Brendan Eich [:brendan]
	Comment 5 • 15 years ago

For mozilla-central, doing one's own landings would be easy and I'd do it myself, provided it's not going to mess up sayrer's merges and tree sync tracking.

I don't have the hg-fu to do the branch landings, but I could learn. mrbkap can do it, I've seen him ;-).

/be

	Blake Kaplan (:mrbkap) (inactive) Assignee
	Comment 6 • 15 years ago

I'm going to let sayrer take care of the full merge. I'll just cherry-pick this fix to m-c (the merge tools will do the Right Thing (TM)).

	Robert Sayre
	Comment 7 • 15 years ago

http://hg.mozilla.org/mozilla-central/rev/bc8bbb513d4e

	Robert Sayre
	Comment 8 • 15 years ago

http://hg.mozilla.org/releases/mozilla-1.9.2/rev/88964445ffb2