summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/Options.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/JavaScriptCore/runtime/Options.cpp')
-rw-r--r--Source/JavaScriptCore/runtime/Options.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/JavaScriptCore/runtime/Options.cpp b/Source/JavaScriptCore/runtime/Options.cpp
index b164948a5..ed0720b54 100644
--- a/Source/JavaScriptCore/runtime/Options.cpp
+++ b/Source/JavaScriptCore/runtime/Options.cpp
@@ -127,6 +127,11 @@ void Options::initialize()
JSC_OPTIONS(FOR_EACH_OPTION)
#undef FOR_EACH_OPTION
+#if USE(CF) || OS(UNIX)
+ objectsAreImmortal() = !!getenv("JSImmortalZombieEnabled");
+ useZombieMode() = !!getenv("JSImmortalZombieEnabled") || !!getenv("JSZombieEnabled");
+#endif
+
// Allow environment vars to override options if applicable.
// The evn var should be the name of the option prefixed with
// "JSC_".
@@ -149,11 +154,6 @@ void Options::initialize()
useRegExpJIT() = false;
#endif
-#if USE(CF) || OS(UNIX)
- zombiesAreImmortal() = !!getenv("JSImmortalZombieEnabled");
- useZombieMode() = zombiesAreImmortal() || !!getenv("JSZombieEnabled");
-#endif
-
// Do range checks where needed and make corrections to the options:
ASSERT(thresholdForOptimizeAfterLongWarmUp() >= thresholdForOptimizeAfterWarmUp());
ASSERT(thresholdForOptimizeAfterWarmUp() >= thresholdForOptimizeSoon());