From 9da01a4e7fcbdf7bd59b3407488b0a7ae4d6c2d9 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Wed, 4 Mar 2015 17:01:09 -0800
Subject: [PATCH] Backed out changeset f88b64c38d3d (bug 1120655) for adding
 hazards to a CLOSED TREE

---
 js/src/devtools/rootAnalysis/annotations.js    | 5 -----
 js/src/devtools/rootAnalysis/computeGCTypes.js | 7 -------
 2 files changed, 12 deletions(-)

diff --git a/js/src/devtools/rootAnalysis/annotations.js b/js/src/devtools/rootAnalysis/annotations.js
index f793032ff1da..fac814b81f48 100644
--- a/js/src/devtools/rootAnalysis/annotations.js
+++ b/js/src/devtools/rootAnalysis/annotations.js
@@ -281,8 +281,3 @@ function isOverridableField(initialCSU, csu, field)
 
     return true;
 }
-
-function isGCPointer(typeName)
-{
-    return typeName.indexOf("CompartmentsIter") != -1;
-}
diff --git a/js/src/devtools/rootAnalysis/computeGCTypes.js b/js/src/devtools/rootAnalysis/computeGCTypes.js
index 450d56ee05ca..4f91ae6b4d3b 100644
--- a/js/src/devtools/rootAnalysis/computeGCTypes.js
+++ b/js/src/devtools/rootAnalysis/computeGCTypes.js
@@ -5,8 +5,6 @@
 loadRelativeToScript('utility.js');
 loadRelativeToScript('annotations.js');
 
-var annotatedGCPointers = [];
-
 function processCSU(csu, body)
 {
     if (!("DataField" in body))
@@ -27,8 +25,6 @@ function processCSU(csu, body)
             addNestedStructure(csu, type.Name, fieldName);
         }
     }
-    if (isGCPointer(csu))
-        annotatedGCPointers.push(csu);
 }
 
 var structureParents = {}; // Map from field => list of <parent, fieldName>
@@ -147,9 +143,6 @@ addGCType('js::ion::IonCode');
 addGCPointer('JS::Value');
 addGCPointer('jsid');
 
-for (var typeName of annotatedGCPointers)
-    addGCPointer(typeName);
-
 // AutoCheckCannotGC should also not be held live across a GC function.
 addGCPointer('JS::AutoCheckCannotGC');