406079 - --enable-dtrace broken

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Dan Mills [:thunder]]

Attachment: JSFunction->clasp fixes. Use -p1 to apply.

My build dies with:

mozilla/js/src/jsdtracef.c:202: error: 'struct JSFunction' has no member named 'clasp'

This is because this commit:

http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&root=/cvsroot&subdir=/mozilla/js/src&command=DIFF_FRAMESET&file=jsfun.h&rev2=3.49&rev1=3.48

Moved clasp, but jsdtracef.c hasn't changed to use ->u.n.clasp.

Attached a patch I'm building with now; still untested (my build got past /js, but hasn't finished yet).

Comment 1

[Igor Bukanov]

Comment on attachment 290765 [details] [diff] [review]
JSFunction->clasp fixes.  Use -p1 to apply.

> void
> jsdtrace_function_entry(JSContext *cx, JSStackFrame *fp, JSFunction *fun)
> {
>     JAVASCRIPT_FUNCTION_ENTRY(
>         jsdtrace_filename(fp),
>-        fun->clasp ? (char *)fun->clasp->name : dempty,
>+        fun->u.n.clasp ? (char *)fun->u.n.clasp->name : dempty,

This is wrong, the proper fix is to change the line into:

!FUN_INTERPRETED(fun) && fun->u.n.clasp ? (char *)fun->u.n.clasp->name : dempty

Comment 2

[Dan Mills [:thunder]]

Attachment: Patch v1.1

Thanks, Igor.  Here's a new patch with your fix.

Comment 3

[Igor Bukanov]

Comment on attachment 290777 [details] [diff] [review]
Patch v1.1

> void
> jsdtrace_function_entry(JSContext *cx, JSStackFrame *fp, JSFunction *fun)
> {
>     JAVASCRIPT_FUNCTION_ENTRY(
>         jsdtrace_filename(fp),
>-        fun->clasp ? (char *)fun->clasp->name : dempty,
>+        !FUN_INTERPRETED(fun) &&
>+            fun->u.n.clasp ? (char *)fun->u.n.clasp->name : dempty,

Sorry I was not clear last time but I meant to protect all usages of u.n.clasp in the patch with !FUN_INTERPRETED(fun). That also suggests to have a utility function to get the class name for a function ot dempty.

Comment 4

[Alfred Peng]

Attachment: Patch v2

Igor, is this patch the right way to go?

Comment 5

[Igor Bukanov]

Comment on attachment 291627 [details] [diff] [review]
Patch v2

Yes, this is it.

Comment 6

[Mike Beltzner [:beltzner, not reading bugmail]]

Comment on attachment 291627 [details] [diff] [review]
Patch v2

a=drivers for M10, as this code only affects people running with dtrace enabled, and I'd rather get more perf data work done sooner than later :)

Comment 7

[Igor Bukanov]

Recording regression dependency 

Comment 8

[Igor Bukanov]

I checked in the patch from comment 4 to the CVS trunk:

Checking in jsdtracef.c;
/cvsroot/mozilla/js/src/jsdtracef.c,v  <--  jsdtracef.c
new revision: 3.2; previous revision: 3.1
done