417972 - JS_PrintTraceThingInfo prints first slot as private when !(clasp->flags & JSCLASS_HAS_PRIVATE)

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Attachment: patch

I got a bit confused in bug 417949 comment 8 because JS_PrintTraceThingInfo prints something as though it's the object's private even when JSCLASS_HAS_PRIVATE is not set.  In that case, what's there is just the first slot.

This patch makes it print "<no private>" instead.

Comment 1

[Igor Bukanov]

Comment on attachment 303766 [details] [diff] [review]
patch

>In JS_PrintTraceThingInfo, only print the contents of JSSLOT_PRIVATE if it represents the class's private rather than the first slot.
>
>diff --git a/js/src/jsapi.c b/js/src/jsapi.c
>--- a/js/src/jsapi.c
>+++ b/js/src/jsapi.c
>@@ -2006,12 +2006,17 @@ JS_PrintTraceThingInfo(char *buf, size_t
>           case JSTRACE_OBJECT:
>           {
>             JSObject  *obj = (JSObject *)thing;
>-            jsval     privateValue = STOBJ_GET_SLOT(obj, JSSLOT_PRIVATE);
>-            void      *privateThing = JSVAL_IS_VOID(privateValue)
>-                                      ? NULL
>-                                      : JSVAL_TO_PRIVATE(privateValue);
>-
>-            JS_snprintf(buf, bufsize, "%p", privateThing);
>+            JSClass *clasp = STOBJ_GET_CLASS(obj);
>+            if (clasp->flags & JSCLASS_HAS_PRIVATE) {
>+              jsval     privateValue = STOBJ_GET_SLOT(obj, JSSLOT_PRIVATE);

Nit: the indent level in SpiderMonkey is 4. It is 2 only after a case or label. r+ with that fixed.

Comment 2

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Attachment: patch

er, right, thanks.  That's what I get for being in the middle of a case statement.

Comment 3

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

Checked in to trunk, 2008-02-18 22:19 -0800.