From 1cac08b9a2d2171593fc6737e1b649d81ff39784 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Mon, 26 Jun 2017 22:20:37 +0200
Subject: Remove remaining conditional GCZeal code.

Creates stubs:
jsgc.h/cpp
VerifyBarriers() stub
MaybeVerifyBarriers() stub
GCRuntime::computeNonIncrementalMarkingForValidation() stub
GCRuntime::validateIncrementalMarking() stub
GCRuntime::finishMarkingValidation() stub
GCRuntime::pushZealSelectedObjects() stub
bool useZeal?
GCRuntime::runDebugGC() stub
XPConnect:
nsXPCComponents_Utils::SetGCZeal() stub (always NS_OK)
---
 js/xpconnect/src/XPCComponents.cpp |  3 ---
 js/xpconnect/src/XPCJSContext.cpp  | 10 ----------
 js/xpconnect/src/XPCShellImpl.cpp  | 18 ------------------
 3 files changed, 31 deletions(-)

(limited to 'js/xpconnect')

diff --git a/js/xpconnect/src/XPCComponents.cpp b/js/xpconnect/src/XPCComponents.cpp
index ca78234c9..02b0b4d14 100644
--- a/js/xpconnect/src/XPCComponents.cpp
+++ b/js/xpconnect/src/XPCComponents.cpp
@@ -3007,9 +3007,6 @@ GENERATE_JSCONTEXTOPTION_GETTER_SETTER(Ion, ion, setIon)
 NS_IMETHODIMP
 nsXPCComponents_Utils::SetGCZeal(int32_t aValue, JSContext* cx)
 {
-#ifdef JS_GC_ZEAL
-    JS_SetGCZeal(cx, uint8_t(aValue), JS_DEFAULT_ZEAL_FREQ);
-#endif
     return NS_OK;
 }
 
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index 6981b525c..defd1b785 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -1473,16 +1473,6 @@ ReloadPrefsCallback(const char* pref, void* data)
     sExtraWarningsForSystemJS = Preferences::GetBool(JS_OPTIONS_DOT_STR "strict.debug");
 #endif
 
-#ifdef JS_GC_ZEAL
-    int32_t zeal = Preferences::GetInt(JS_OPTIONS_DOT_STR "gczeal", -1);
-    int32_t zeal_frequency =
-        Preferences::GetInt(JS_OPTIONS_DOT_STR "gczeal.frequency",
-                            JS_DEFAULT_ZEAL_FREQ);
-    if (zeal >= 0) {
-        JS_SetGCZeal(cx, (uint8_t)zeal, zeal_frequency);
-    }
-#endif // JS_GC_ZEAL
-
     JS::ContextOptionsRef(cx).setBaseline(useBaseline)
                              .setIon(useIon)
                              .setAsmJS(useAsmJS)
diff --git a/js/xpconnect/src/XPCShellImpl.cpp b/js/xpconnect/src/XPCShellImpl.cpp
index d86b5c5d3..d9629bfed 100644
--- a/js/xpconnect/src/XPCShellImpl.cpp
+++ b/js/xpconnect/src/XPCShellImpl.cpp
@@ -440,21 +440,6 @@ GC(JSContext* cx, unsigned argc, Value* vp)
     return true;
 }
 
-#ifdef JS_GC_ZEAL
-static bool
-GCZeal(JSContext* cx, unsigned argc, Value* vp)
-{
-    CallArgs args = CallArgsFromVp(argc, vp);
-    uint32_t zeal;
-    if (!ToUint32(cx, args.get(0), &zeal))
-        return false;
-
-    JS_SetGCZeal(cx, uint8_t(zeal), JS_DEFAULT_ZEAL_FREQ);
-    args.rval().setUndefined();
-    return true;
-}
-#endif
-
 static bool
 SendCommand(JSContext* cx, unsigned argc, Value* vp)
 {
@@ -652,9 +637,6 @@ static const JSFunctionSpec glob_functions[] = {
     JS_FS("dumpXPC",         DumpXPC,        1,0),
     JS_FS("dump",            Dump,           1,0),
     JS_FS("gc",              GC,             0,0),
-#ifdef JS_GC_ZEAL
-    JS_FS("gczeal",          GCZeal,         1,0),
-#endif
     JS_FS("options",         Options,        0,0),
     JS_FS("sendCommand",     SendCommand,    1,0),
     JS_FS("atob",            xpc::Atob,      1,0),
-- 
cgit v1.2.3