Changeset 163794 in webkit

Timestamp:

Feb 10, 2014 10:02:59 AM (10 years ago)

Author:

fpizlo@apple.com

Message:

JSC environment variables should override other mechanisms for setting options
​https://bugs.webkit.org/show_bug.cgi?id=128511

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

• runtime/Options.cpp:

(JSC::Options::setOption):

• runtime/Options.h:

Source/WebKit2:

• WebProcess/mac/WebProcessMac.mm:

(WebKit::WebProcess::platformInitializeWebProcess):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/Options.cpp (modified) (3 diffs)
• JavaScriptCore/runtime/Options.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/mac/WebProcessMac.mm (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-02-10  Filip Pizlo  <fpizlo@apple.com>
+
+        JSC environment variables should override other mechanisms for setting options
+        https://bugs.webkit.org/show_bug.cgi?id=128511
+
+        Reviewed by Geoffrey Garen.
+
+        * runtime/Options.cpp:
+        (JSC::Options::setOption):
+        * runtime/Options.h:
+
 2014-02-10  Darin Adler  <darin@apple.com>
 

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -78 +78 @@
 
 template<typename T>
-void overrideOptionWithHeuristic(T& variable, const char* name)
+bool overrideOptionWithHeuristic(T& variable, const char* name)
 {
 #if !OS(WINCE)
     const char* stringValue = getenv(name);
     if (!stringValue)
-        return;
+        return false;
     
     if (parse(stringValue, variable))
-        return;
+        return true;
     
     fprintf(stderr, "WARNING: failed to parse %s=%s\n", name, stringValue);
 #endif
+    return false;
 }
 
@@ -237 +238 @@
     // "JSC_".
 #define FOR_EACH_OPTION(type_, name_, defaultValue_) \
-    overrideOptionWithHeuristic(name_(), "JSC_" #name_);
+    if (overrideOptionWithHeuristic(name_(), "JSC_" #name_)) \
+        s_options[OPT_##name_].didOverride = true;
     JSC_OPTIONS(FOR_EACH_OPTION)
 #undef FOR_EACH_OPTION
@@ -274 +276 @@
         if (success) {                                  \
             name_() = value;                            \
+            s_options[OPT_##name_].didOverride = true;  \
             recomputeDependentOptions();                \
             return true;                                \

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -269 +269 @@
     // Declare accessors for each option:
 #define FOR_EACH_OPTION(type_, name_, defaultValue_) \
-    ALWAYS_INLINE static type_& name_() { return s_options[OPT_##name_].u.type_##Val; }
+    ALWAYS_INLINE static type_& name_() { return s_options[OPT_##name_].u.type_##Val; } \
+    static bool name_##WasOverridden() { return s_options[OPT_##name_].didOverride; }
 
     JSC_OPTIONS(FOR_EACH_OPTION)
@@ -292 +293 @@
             OptionRange optionRangeVal;
         } u;
+        bool didOverride;
     };
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-02-10  Filip Pizlo  <fpizlo@apple.com>
+
+        JSC environment variables should override other mechanisms for setting options
+        https://bugs.webkit.org/show_bug.cgi?id=128511
+
+        Reviewed by Geoffrey Garen.
+
+        * WebProcess/mac/WebProcessMac.mm:
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2014-02-10  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/WebProcess/mac/WebProcessMac.mm

@@ -174 +174 @@
     Font::setDefaultTypesettingFeatures(parameters.shouldEnableKerningAndLigaturesByDefault ? Kerning | Ligatures : 0);
 
-    JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
+    if (!JSC::Options::useFTLJITWasOverridden())
+        JSC::Options::useFTLJIT() = parameters.shouldEnableFTL;
 
     m_compositingRenderServerPort = parameters.acceleratedCompositingPort.port();