From f481ffbe47ec023390c222abec31386b4459895f Mon Sep 17 00:00:00 2001 From: Jon Coppeard Date: Tue, 27 Jan 2015 10:21:55 +0000 Subject: [PATCH] Bug 1124581 - Remove dead code related to conservative scanner r=terrence --- js/src/gc/Verifier.cpp | 1 - js/src/vm/Runtime.h | 16 ---------------- 2 files changed, 17 deletions(-) diff --git a/js/src/gc/Verifier.cpp b/js/src/gc/Verifier.cpp index c42acb383bc..0a309500d72 100644 --- a/js/src/gc/Verifier.cpp +++ b/js/src/gc/Verifier.cpp @@ -219,7 +219,6 @@ gc::GCRuntime::startVerifyPreBarriers() /* Create the root node. */ trc->curnode = MakeNode(trc, nullptr, JSGCTraceKind(0)); - /* We want MarkRuntime to save the roots to gcSavedRoots. */ incrementalState = MARK_ROOTS; /* Make all the roots be edges emanating from the root node. */ diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h index b768db59c4f..fab44e6c96c 100644 --- a/js/src/vm/Runtime.h +++ b/js/src/vm/Runtime.h @@ -496,22 +496,6 @@ class PerThreadData : public PerThreadDataFriendFields JSRuntime *runtime_; public: - /* - * We save all conservative scanned roots in this vector so that - * conservative scanning can be "replayed" deterministically. In DEBUG mode, - * this allows us to run a non-incremental GC after every incremental GC to - * ensure that no objects were missed. - */ -#ifdef DEBUG - struct SavedGCRoot { - void *thing; - JSGCTraceKind kind; - - SavedGCRoot(void *thing, JSGCTraceKind kind) : thing(thing), kind(kind) {} - }; - js::Vector gcSavedRoots; -#endif - #ifdef JS_TRACE_LOGGING TraceLoggerThread *traceLogger; #endif