Backed out 2 changesets (bug 1204169, bug 1074935) for Werror bustage CLOSED TREE

Backed out changeset b4621131ea01 (bug 1074935)
Backed out changeset 14dbd30e63af (bug 1204169)

js/src/gc/GCInternals.h

@@ -56,7 +56,6 @@ class MOZ_RAII AutoTraceSession
     void operator=(const AutoTraceSession&) = delete;
 
     JS::HeapState prevState;
-    AutoSPSEntry pseudoFrame;
 };
 
 struct MOZ_RAII AutoPrepareForTracing

js/src/jsgc.cpp

@@ -5580,28 +5580,11 @@ GCRuntime::finishCollection(JS::gcreason::Reason reason)
     }
 }
 
-static const char*
-HeapStateToLabel(JS::HeapState heapState)
-{
-    switch (heapState) {
-      case JS::HeapState::MinorCollecting:
-        return "js::Nursery::collect";
-      case JS::HeapState::MajorCollecting:
-        return "js::GCRuntime::collect";
-      case JS::HeapState::Tracing:
-        return "JS_IterateCompartments";
-      case JS::HeapState::Idle:
-        MOZ_CRASH("Should never have an Idle heap state when pushing GC pseudo frames!");
-    }
-    MOZ_ASSERT_UNREACHABLE("Should have exhausted every JS::HeapState variant!");
-}
-
 /* Start a new heap session. */
 AutoTraceSession::AutoTraceSession(JSRuntime* rt, JS::HeapState heapState)
   : lock(rt),
     runtime(rt),
-    prevState(rt->heapState_),
-    pseudoFrame(rt, HeapStateToLabel(heapState), ProfileEntry::Category::GC)
+    prevState(rt->heapState_)
 {
     MOZ_ASSERT(rt->heapState_ == JS::HeapState::Idle);
     MOZ_ASSERT(heapState != JS::HeapState::Idle);

js/src/vm/String.cpp

@@ -14,7 +14,6 @@
 
 #include "gc/Marking.h"
 #include "js/UbiNode.h"
-#include "vm/SPSProfiler.h"
 
 #include "jscntxtinlines.h"
 #include "jscompartmentinlines.h"
@@ -555,10 +554,6 @@ JSRope::flattenInternal(ExclusiveContext* maybecx)
 JSFlatString*
 JSRope::flatten(ExclusiveContext* maybecx)
 {
-    mozilla::Maybe<AutoSPSEntry> sps;
-    if (maybecx && maybecx->isJSContext())
-        sps.emplace(maybecx->asJSContext()->runtime(), "JSRope::flatten");
-
     if (zone()->needsIncrementalBarrier())
         return flattenInternal<WithIncrementalBarrier>(maybecx);
     return flattenInternal<NoBarrier>(maybecx);