Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 475334 - Don't trigger debugger hooks until frame initialization is complete. r=mrbkap a=dveditz

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@256422 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com 2009-03-03 01:53:11 +00:00
parent 2c1b3bf142
commit efc072e676
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mozilla/js/src/jsinterp.c
View File

@ -4768,16 +4768,6 @@ interrupt:
newifp->frame.regs = NULL;
newifp->frame.spbase = NULL;
/* Call the debugger hook if present. */
hook = cx->debugHooks->callHook;
if (hook) {
newifp->hookData = hook(cx, &newifp->frame, JS_TRUE, 0,
cx->debugHooks->callHookData);
LOAD_INTERRUPT_HANDLER(cx);
} else {
newifp->hookData = NULL;
}
/* Scope with a call object parented by callee's parent. */
if (JSFUN_HEAVYWEIGHT_TEST(fun->flags) &&
!js_GetCallObject(cx, &newifp->frame, parent)) {
@ -4800,6 +4790,16 @@ interrupt:
newifp->frame.regs = &regs;
cx->fp = fp = &newifp->frame;
/* Call the debugger hook if present. */
hook = cx->debugHooks->callHook;
if (hook) {
newifp->hookData = hook(cx, &newifp->frame, JS_TRUE, 0,
cx->debugHooks->callHookData);
LOAD_INTERRUPT_HANDLER(cx);
} else {
newifp->hookData = NULL;
}
inlineCallCount++;
JS_RUNTIME_METER(rt, inlineCalls);