diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-03 19:02:06 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-03 19:03:05 +0100 |
| commit | 10494e1b7d0b3cd945bb76dca10f5637cf786f27 (patch) | |
| tree | 8a6487e386c06e7dfe63f2a4f2ffe5b589c59f60 /js/src/shell/js.cpp | |
| parent | 559933a9a58f96ac62ad0f60602f45344581604f (diff) | |
| parent | e27da6cc5e825b58f810b368b2bd59bca2164ab0 (diff) | |
| download | UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.gz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.lz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.tar.xz UXP-10494e1b7d0b3cd945bb76dca10f5637cf786f27.zip | |
Merge branch 'ported-moebius'
Remove GCZeal code from Spidermonkey.
This resolves #8
Diffstat (limited to 'js/src/shell/js.cpp')
| -rw-r--r-- | js/src/shell/js.cpp | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/js/src/shell/js.cpp b/js/src/shell/js.cpp index 00a4a503c..88d482a23 100644 --- a/js/src/shell/js.cpp +++ b/js/src/shell/js.cpp @@ -323,10 +323,6 @@ static bool enableNativeRegExp = false; static bool enableUnboxedArrays = false; static bool enableSharedMemory = SHARED_MEMORY_DEFAULT; static bool enableWasmAlwaysBaseline = false; -#ifdef JS_GC_ZEAL -static uint32_t gZealBits = 0; -static uint32_t gZealFrequency = 0; -#endif static bool printTiming = false; static const char* jsCacheDir = nullptr; static const char* jsCacheAsmJSPath = nullptr; @@ -7517,16 +7513,6 @@ SetContextOptions(JSContext* cx, const OptionParser& op) dumpEntrainedVariables = op.getBoolOption("dump-entrained-variables"); #endif -#ifdef JS_GC_ZEAL - const char* zealStr = op.getStringOption("gc-zeal"); - if (zealStr) { - if (!cx->gc.parseAndSetZeal(zealStr)) - return false; - uint32_t nextScheduled; - cx->gc.getZealBits(&gZealBits, &gZealFrequency, &nextScheduled); - } -#endif - return true; } @@ -7544,16 +7530,6 @@ SetWorkerContextOptions(JSContext* cx) cx->setOffthreadIonCompilationEnabled(offthreadCompilation); cx->profilingScripts = enableCodeCoverage || enableDisassemblyDumps; -#ifdef JS_GC_ZEAL - if (gZealBits && gZealFrequency) { -#define ZEAL_MODE(_, value) \ - if (gZealBits & (1 << value)) \ - cx->gc.setZeal(value, gZealFrequency); - JS_FOR_EACH_ZEAL_MODE(ZEAL_MODE) -#undef ZEAL_MODE - } -#endif - JS_SetNativeStackQuota(cx, gMaxStackSize); } @@ -7838,9 +7814,6 @@ main(int argc, char** argv, char** envp) "NUMBER of instructions.", -1) #endif || !op.addIntOption('\0', "nursery-size", "SIZE-MB", "Set the maximum nursery size in MB", 16) -#ifdef JS_GC_ZEAL - || !op.addStringOption('z', "gc-zeal", "LEVEL(;LEVEL)*[,N]", gc::ZealModeHelpText) -#endif || !op.addStringOption('\0', "module-load-path", "DIR", "Set directory to load modules from") ) { |