Backed out changeset 122e1eaf7a4c (bug 1307446) for failing saved-stacks/async-principals.js. r=backout

This commit is contained in:
Sebastian Hengst 2016-10-04 18:29:51 +02:00
Родитель 774a8bf34d
Коммит 42316b8d09
1 изменённых файлов: 1 добавлений и 5 удалений

Просмотреть файл

@ -314,7 +314,6 @@ static bool enableNativeRegExp = false;
static bool enableUnboxedArrays = false;
static bool enableSharedMemory = SHARED_MEMORY_DEFAULT;
static bool enableWasmAlwaysBaseline = false;
static bool enableAsyncStacks = false;
#ifdef JS_GC_ZEAL
static uint32_t gZealBits = 0;
static uint32_t gZealFrequency = 0;
@ -7133,7 +7132,6 @@ SetContextOptions(JSContext* cx, const OptionParser& op)
enableNativeRegExp = !op.getBoolOption("no-native-regexp");
enableUnboxedArrays = op.getBoolOption("unboxed-arrays");
enableWasmAlwaysBaseline = op.getBoolOption("wasm-always-baseline");
enableAsyncStacks = op.getBoolOption("async-stacks");
JS::ContextOptionsRef(cx).setBaseline(enableBaseline)
.setIon(enableIon)
@ -7141,8 +7139,7 @@ SetContextOptions(JSContext* cx, const OptionParser& op)
.setWasm(true)
.setWasmAlwaysBaseline(enableWasmAlwaysBaseline)
.setNativeRegExp(enableNativeRegExp)
.setUnboxedArrays(enableUnboxedArrays)
.setAsyncStack(enableAsyncStacks);
.setUnboxedArrays(enableUnboxedArrays);
if (op.getBoolOption("no-unboxed-objects"))
jit::JitOptions.disableUnboxedObjects = true;
@ -7601,7 +7598,6 @@ main(int argc, char** argv, char** envp)
|| !op.addBoolOption('\0', "no-unboxed-objects", "Disable creating unboxed plain objects")
|| !op.addBoolOption('\0', "unboxed-arrays", "Allow creating unboxed arrays")
|| !op.addBoolOption('\0', "wasm-always-baseline", "Enable experimental Wasm baseline compiler when possible")
|| !op.addBoolOption('\0', "async-stacks", "Enable capturing of async stacks, e.g. for Promises")
#ifdef ENABLE_SHARED_ARRAY_BUFFER
|| !op.addStringOption('\0', "shared-memory", "on/off",
"SharedArrayBuffer and Atomics "