jorendorff's JS_DEBUG_TITLE_LOCKS patch (417818, r=shaver).

js/src/jslock.c

@@ -1288,5 +1288,19 @@ js_IsTitleLocked(JSContext *cx, JSTitle *title)
            ((JSThread *)Thin_RemoveWait(ReadWord(title->lock.owner)))->id;
 }
 
+#ifdef JS_DEBUG_TITLE_LOCKS
+void
+js_SetScopeInfo(JSScope *scope, const char *file, int line)
+{
+    JSTitle *title = &scope->title;
+    if (!title->ownercx) {
+        jsrefcount count = title->u.count;
+        JS_ASSERT_IF(!SCOPE_IS_SEALED(scope), count > 0);
+        JS_ASSERT(count <= 4);
+        title->file[count - 1] = file;
+        title->line[count - 1] = line;
+    }
+}
+#endif /* JS_DEBUG_TITLE_LOCKS */
 #endif /* DEBUG */
 #endif /* JS_THREADSAFE */

js/src/jslock.h

@@ -90,7 +90,7 @@ struct JSTitle {
         jsrefcount  count;              /* lock entry count for reentrancy */
         JSTitle     *link;              /* next link in rt->titleSharingTodo */
     } u;
-#ifdef JS_DEBUG_SCOPE_LOCKS
+#ifdef JS_DEBUG_TITLE_LOCKS
     const char      *file[4];           /* file where lock was (re-)taken */
     unsigned int    line[4];            /* line where lock was (re-)taken */
 #endif
@@ -137,7 +137,7 @@ struct JSTitle {
  * to be fixed by moving JS_LOCK_SCOPE to jsscope.h, JS_LOCK_OBJ to jsobj.h,
  * and so on.
  *
- * We also need jsscope.h #ifdef JS_DEBUG_SCOPE_LOCKS for SET_OBJ_INFO and
+ * We also need jsscope.h #ifdef JS_DEBUG_TITLE_LOCKS for SET_OBJ_INFO and
  * SET_SCOPE_INFO, but we do not want any nested includes that depend on DEBUG.
  * Those lead to build bustage when someone makes a change that depends in a
  * subtle way on jsscope.h being included directly or indirectly, but does not
@@ -152,18 +152,8 @@ JS_BEGIN_EXTERN_C
 #define SET_OBJ_INFO(obj_, file_, line_)                                       \
     SET_SCOPE_INFO(OBJ_SCOPE(obj_), file_, line_)
 
-#define SET_SCOPE_INFO(scope_,file_,line_)                                     \
+#define SET_SCOPE_INFO(scope_, file_, line_)                                   \
-    do {                                                                       \
+    js_SetScopeInfo(scope_, file_, line_)
-        JSTitle *title = &(scope_)->title;                                     \
-        jsrefcount count;                                                      \
-        if (title->ownercx)                                                    \
-            break;                                                             \
-        count = title->u.count;                                                \
-        JS_ASSERT((0 < count && count <= 4) ||                                 \
-                  SCOPE_IS_SEALED(scope_)));                                   \
-        title->file[count - 1] = (file_);                                      \
-        title->line[line - 1] = (line_);                                       \
-    } while (0)
 
 #endif
 
@@ -225,6 +215,9 @@ extern void js_FinishSharingTitle(JSContext *cx, JSTitle *title);
 extern JSBool js_IsRuntimeLocked(JSRuntime *rt);
 extern JSBool js_IsObjLocked(JSContext *cx, JSObject *obj);
 extern JSBool js_IsTitleLocked(JSContext *cx, JSTitle *title);
+#ifdef JS_DEBUG_TITLE_LOCKS
+extern void js_SetScopeInfo(JSScope *scope, const char *file, int line);
+#endif
 
 #else