From 7adc394b800e3b34edfe9d1676745bb762f0cd49 Mon Sep 17 00:00:00 2001
From: Steve Fink <sfink@mozilla.com>
Date: Wed, 11 Sep 2013 12:38:36 -0700
Subject: [PATCH] Bug 916988 - NS_IsMainThread does not GC, r=terrence

--HG--
extra : rebase_source : 8a85b2bcf4f52b6f09b3ac06da9d205c572ae6e0
---
 js/src/devtools/rootAnalysis/annotations.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/src/devtools/rootAnalysis/annotations.js b/js/src/devtools/rootAnalysis/annotations.js
index d67cb19b2bc8..71613aeb5add 100644
--- a/js/src/devtools/rootAnalysis/annotations.js
+++ b/js/src/devtools/rootAnalysis/annotations.js
@@ -73,6 +73,7 @@ var ignoreCallees = {
     "icu_50::UObject.__deleting_dtor" : true, // destructors in ICU code can't cause GC
     "mozilla::CycleCollectedJSRuntime.DescribeCustomObjects" : true, // During tracing, cannot GC.
     "mozilla::CycleCollectedJSRuntime.NoteCustomGCThingXPCOMChildren" : true, // During tracing, cannot GC.
+    "nsIThreadManager.GetIsMainThread" : true,
 };
 
 function fieldCallCannotGC(csu, fullfield)
@@ -138,6 +139,7 @@ var ignoreFunctions = {
     "PR_ErrorInstallTable" : true,
     "PR_SetThreadPrivate" : true,
     "JSObject* js::GetWeakmapKeyDelegate(JSObject*)" : true, // FIXME: mark with AutoAssertNoGC instead
+    "uint8 NS_IsMainThread()" : true,
 
     // These are a little overzealous -- these destructors *can* GC if they end
     // up wrapping a pending exception. See bug 898815 for the heavyweight fix.