667056 - JS_SetFunctionCallback missing calls

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Steve Fink [:sfink] [:s:]]

The call to Probes::enterJSFun was moved into ScriptDebugPrologue (bug 636296), which is only called in debug mode. Probes are not debug-specific, so this is incorrect. In particular, if you configure with --enable-trace-jscalls, you will miss many calls.

Comment 1

[Steve Fink [:sfink] [:s:]]

Attachment: Pull the probes:: calls back out of DebugPrologue

1. Move Probes::enterJSFun from ScriptDebugPrologue to ScriptPrologue
2. Make the opposite change for JM: it was calling ScriptDebugPrologue if the Probes:: stuff wanted to be triggered, but it should really only call the Probes:: stuff.

This patch additionally stops calling the functionCallback when Probes::startExecution is hit, because this change causes us to get a enterJSFun hit for the top-level script anyway (and it was messy besides.)

Comment 2

[Luke Wagner [:luke]]

Comment on attachment 541810 [details] [diff] [review]
Pull the probes:: calls back out of DebugPrologue

Review of attachment 541810 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/src/jsinterpinlines.h
@@ +358,1 @@
>      if (cx->compartment->debugMode)

Since Probes and Debug stuff kindof lump together in my mind, can you take out the intervening whitespace here and for exit too?

Comment 3

[Steve Fink [:sfink] [:s:]]

http://hg.mozilla.org/tracemonkey/rev/970c23eec1ae

(with the suggested whitespace changes)

Comment 4

[Chris Leary [:cdleary] (not checking bugmail)]

cdleary-bot mozilla-central merge info:
http://hg.mozilla.org/mozilla-central/rev/970c23eec1ae