Changeset 209553 in webkit

Timestamp:

Dec 8, 2016 11:43:31 AM (7 years ago)

Author:

mark.lam@apple.com

Message:

Enable JSC restricted options by default in the jsc shell.
​https://bugs.webkit.org/show_bug.cgi?id=165615

Reviewed by Keith Miller.

The jsc shell is only used for debugging and development testing. We should
allow it to use restricted options like JSC_useDollarVM even for release builds.

• jsc.cpp:

(jscmain):

• runtime/Options.cpp:

(JSC::Options::enableRestrictedOptions):
(JSC::Options::isAvailable):
(JSC::allowRestrictedOptions): Deleted.

• runtime/Options.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (1 diff)
• runtime/Options.cpp (modified) (2 diffs)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-12-08  Mark Lam  <mark.lam@apple.com>
+
+        Enable JSC restricted options by default in the jsc shell.
+        https://bugs.webkit.org/show_bug.cgi?id=165615
+
+        Reviewed by Keith Miller.
+
+        The jsc shell is only used for debugging and development testing.  We should
+        allow it to use restricted options like JSC_useDollarVM even for release builds.
+
+        * jsc.cpp:
+        (jscmain):
+        * runtime/Options.cpp:
+        (JSC::Options::enableRestrictedOptions):
+        (JSC::Options::isAvailable):
+        (JSC::allowRestrictedOptions): Deleted.
+        * runtime/Options.h:
+
 2016-12-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -3222 +3222 @@
 int jscmain(int argc, char** argv)
 {
+    // Need to override and enable restricted options before we start parsing options below.
+    Options::enableRestrictedOptions(true);
+
     // Note that the options parsing can affect VM creation, and thus
     // comes first.

trunk/Source/JavaScriptCore/runtime/Options.cpp

@@ -56 +56 @@
 namespace JSC {
 
-static bool allowRestrictedOptions()
-{
+namespace {
 #ifdef NDEBUG
-    return false;
+bool restrictedOptionsEnabled = false;
 #else
-    return true;
-#endif
-}
-
+bool restrictedOptionsEnabled = true;
+#endif
+}
+
+void Options::enableRestrictedOptions(bool enableOrNot)
+{
+    restrictedOptionsEnabled = enableOrNot;
+}
+    
 static bool parse(const char* string, bool& value)
 {
@@ -129 +133 @@
 {
     if (availability == Availability::Restricted)
-        return allowRestrictedOptions();
+        return restrictedOptionsEnabled;
     ASSERT(availability == Availability::Configurable);
     

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -507 +507 @@
     JS_EXPORT_PRIVATE static void ensureOptionsAreCoherent();
 
+    JS_EXPORT_PRIVATE static void enableRestrictedOptions(bool enableOrNot);
+
     // Declare accessors for each option:
 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \