Changeset 249808 in webkit


Ignore:
Timestamp:
Sep 12, 2019, 8:04:29 AM (6 years ago)
Author:
mark.lam@apple.com
Message:

Harden JSC against the abuse of runtime options.
​https://bugs.webkit.org/show_bug.cgi?id=201597
<rdar://problem/55167068>

Reviewed by Filip Pizlo.

JSTests:

Remove the call to forceGCSlowPaths(). This utility function will be removed.
The modern way to set the required option is to use @ requireOptions.

  • stress/ftl-try-catch-oom-error-lazy-slow-path.js:

Source/JavaScriptCore:

Linux parts contributed by Carlos Garcia Campos <​cgarcia@igalia.com>.

  1. Introduce a JSC::Config struct that will be protected as ReadOnly once the first VM instance is constructed. The end of the VM constructor calls Config::permanentlyFreeze() which will make the Config ReadOnly.

Note: this is currently only supported for OS(DARWIN) and OS(LINUX).
OS(WINDOWS) will need to implement some missing pieces before it can enable
this hardening (see FIXME in JSCConfig.cpp).

The hardening strategy here is to put immutable global values into the Config.
Any modifications that need to be made to these values must be done before the
first VM instance is done instantiating. This ensures that no script will
ever run while the Config is still writable.

Also, the policy for this hardening is that a process is opted in by default.
If there's a valid need to disable this hardening (e.g. for some test
environments), the relevant process will need to opt itself out by calling
Config::configureForTesting().

The jsc shell, WK2 UI and WebContent processes are opted in by default.
Only test processes may be opt out.

  1. Put all JSC::Options in the Config. This enforces the invariant that options can only be changed before we instantiate a VM. Once a VM is instantiated, the options are immutable.
  1. Remove functionForceGCSlowPaths() from the jsc shell. Setting Options::forceGCSlowPaths this way is no longer allowed.
  1. Re-factored the Options code (Options.h) into:
    • OptionEntry.h: the data structure that stores the option values.
    • OptionsList.h: the list of options.
    • Options.h: the Options singleton object which is the interface for accessing options.

Renamed the JSC_OPTIONS macro to FOR_EACH_JSC_OPTION, because
"FOR_EACH_JSC_OPTION(SET_OPTION_VALUE)" reads a lot better than
"JSC_OPTIONS(FOR_EACH_OPTION)".

  1. Change testapi to call Config::configureForTesting(). Parts of testapi makes use of setting options in its tests. Hence, this hardening is disabled for testapi.

Note: the jsc shell does enable this hardening.

  1. Put ExecutableAllocator's immutable globals in the Config.
  1. RELEASE_ASSERT that restrictedOptionsEnabled in order to use the FunctionOverrides test utility.
  1. RELEASE_ASSERT that Options::useDollarVM() is enabled in order to use the $vm.

We must RELEASE_ASSERT(Options::useDollarVM()) in all JSDollarVM functions
that are non-trivial at an eye's glance. This includes (but is not limited to):

constructors
create() factory
createStructure() factory
finishCreation()
HOST_CALL or operation functions
Constructors and methods of utility and test classes

The only exception are some constexpr constructors used for instantiating
globals (since these must have trivial constructors) e.g. DOMJITAttribute.
Instead, these constructors should always be ALWAYS_INLINE.

  • API/glib/JSCOptions.cpp:

(jscOptionsSetValue):
(jscOptionsGetValue):
(jsc_options_foreach):
(jsc_options_get_option_group):

  • API/tests/testapi.c:

(main):

  • API/tests/testapi.cpp:

(configureJSCForTesting):

  • CMakeLists.txt:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • Sources.txt:
  • jit/ExecutableAllocator.cpp:

(JSC::isJITEnabled):
(JSC::ExecutableAllocator::setJITEnabled):
(JSC::ExecutableAllocator::initializeUnderlyingAllocator):
(JSC::ExecutableAllocator::isValid const):
(JSC::ExecutableAllocator::underMemoryPressure):
(JSC::ExecutableAllocator::memoryPressureMultiplier):
(JSC::ExecutableAllocator::allocate):
(JSC::ExecutableAllocator::isValidExecutableMemory):
(JSC::ExecutableAllocator::getLock const):
(JSC::ExecutableAllocator::committedByteCount):
(JSC::ExecutableAllocator::dumpProfile):
(JSC::startOfFixedExecutableMemoryPoolImpl):
(JSC::endOfFixedExecutableMemoryPoolImpl):
(JSC::isJITPC):
(JSC::dumpJITMemory):
(JSC::ExecutableAllocator::initialize):
(JSC::ExecutableAllocator::singleton):

  • jit/ExecutableAllocator.h:

(JSC::performJITMemcpy):

  • jsc.cpp:

(GlobalObject::finishCreation):
(functionJSCOptions):
(jscmain):
(functionForceGCSlowPaths): Deleted.

  • runtime/ConfigFile.cpp:

(JSC::ConfigFile::parse):

  • runtime/InitializeThreading.cpp:

(JSC::initializeThreading):

  • runtime/JSCConfig.cpp: Added.

(JSC::Config::disableFreezingForTesting):
(JSC::Config::enableRestrictedOptions):
(JSC::Config::permanentlyFreeze):

  • runtime/JSCConfig.h: Added.

(JSC::Config::configureForTesting):

  • runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::exposeDollarVM):

  • runtime/OptionEntry.h: Added.

(JSC::OptionRange::operator= ):
(JSC::OptionRange::rangeString const):

  • runtime/Options.cpp:

(JSC::Options::isAvailable):
(JSC::scaleJITPolicy):
(JSC::Options::initialize):
(JSC::Options::setOptions):
(JSC::Options::setOptionWithoutAlias):
(JSC::Options::setAliasedOption):
(JSC::Option::dump const):
(JSC::Option::operator== const):
(): Deleted.
(JSC::Options::enableRestrictedOptions): Deleted.

  • runtime/Options.h:

(JSC::Option::Option):
(JSC::Option::defaultOption const):
(JSC::Option::boolVal):
(JSC::Option::unsignedVal):
(JSC::Option::doubleVal):
(JSC::Option::int32Val):
(JSC::Option::optionRangeVal):
(JSC::Option::optionStringVal):
(JSC::Option::gcLogLevelVal):
(JSC::OptionRange::operator= ): Deleted.
(JSC::OptionRange::rangeString const): Deleted.

  • runtime/OptionsList.h: Added.

(JSC::countNumberOfJSCOptions):

  • runtime/VM.cpp:

(JSC::VM::VM):

  • tools/FunctionOverrides.cpp:

(JSC::FunctionOverrides::FunctionOverrides):
(JSC::FunctionOverrides::reinstallOverrides):
(JSC::FunctionOverrides::initializeOverrideFor):
(JSC::FunctionOverrides::parseOverridesInFile):

  • tools/JSDollarVM.cpp:

(JSC::JSDollarVMCallFrame::JSDollarVMCallFrame):
(JSC::JSDollarVMCallFrame::createStructure):
(JSC::JSDollarVMCallFrame::create):
(JSC::JSDollarVMCallFrame::finishCreation):
(JSC::JSDollarVMCallFrame::addProperty):
(JSC::Element::Element):
(JSC::Element::create):
(JSC::Element::createStructure):
(JSC::Root::Root):
(JSC::Root::create):
(JSC::Root::createStructure):
(JSC::SimpleObject::SimpleObject):
(JSC::SimpleObject::create):
(JSC::SimpleObject::createStructure):
(JSC::ImpureGetter::ImpureGetter):
(JSC::ImpureGetter::createStructure):
(JSC::ImpureGetter::create):
(JSC::ImpureGetter::finishCreation):
(JSC::ImpureGetter::getOwnPropertySlot):
(JSC::CustomGetter::CustomGetter):
(JSC::CustomGetter::createStructure):
(JSC::CustomGetter::create):
(JSC::CustomGetter::getOwnPropertySlot):
(JSC::CustomGetter::customGetter):
(JSC::CustomGetter::customGetterAcessor):
(JSC::RuntimeArray::create):
(JSC::RuntimeArray::destroy):
(JSC::RuntimeArray::getOwnPropertySlot):
(JSC::RuntimeArray::getOwnPropertySlotByIndex):
(JSC::RuntimeArray::createPrototype):
(JSC::RuntimeArray::createStructure):
(JSC::RuntimeArray::finishCreation):
(JSC::RuntimeArray::RuntimeArray):
(JSC::RuntimeArray::lengthGetter):
(JSC::DOMJITNode::DOMJITNode):
(JSC::DOMJITNode::createStructure):
(JSC::DOMJITNode::checkSubClassSnippet):
(JSC::DOMJITNode::create):
(JSC::DOMJITGetter::DOMJITGetter):
(JSC::DOMJITGetter::createStructure):
(JSC::DOMJITGetter::create):
(JSC::DOMJITGetter::DOMJITAttribute::DOMJITAttribute):
(JSC::DOMJITGetter::DOMJITAttribute::slowCall):
(JSC::DOMJITGetter::DOMJITAttribute::callDOMGetter):
(JSC::DOMJITGetter::customGetter):
(JSC::DOMJITGetter::finishCreation):
(JSC::DOMJITGetterComplex::DOMJITGetterComplex):
(JSC::DOMJITGetterComplex::createStructure):
(JSC::DOMJITGetterComplex::create):
(JSC::DOMJITGetterComplex::DOMJITAttribute::DOMJITAttribute):
(JSC::DOMJITGetterComplex::DOMJITAttribute::slowCall):
(JSC::DOMJITGetterComplex::DOMJITAttribute::callDOMGetter):
(JSC::DOMJITGetterComplex::functionEnableException):
(JSC::DOMJITGetterComplex::customGetter):
(JSC::DOMJITGetterComplex::finishCreation):
(JSC::DOMJITFunctionObject::DOMJITFunctionObject):
(JSC::DOMJITFunctionObject::createStructure):
(JSC::DOMJITFunctionObject::create):
(JSC::DOMJITFunctionObject::functionWithTypeCheck):
(JSC::DOMJITFunctionObject::functionWithoutTypeCheck):
(JSC::DOMJITFunctionObject::checkSubClassSnippet):
(JSC::DOMJITFunctionObject::finishCreation):
(JSC::DOMJITCheckSubClassObject::DOMJITCheckSubClassObject):
(JSC::DOMJITCheckSubClassObject::createStructure):
(JSC::DOMJITCheckSubClassObject::create):
(JSC::DOMJITCheckSubClassObject::functionWithTypeCheck):
(JSC::DOMJITCheckSubClassObject::functionWithoutTypeCheck):
(JSC::DOMJITCheckSubClassObject::finishCreation):
(JSC::DOMJITGetterBaseJSObject::DOMJITGetterBaseJSObject):
(JSC::DOMJITGetterBaseJSObject::createStructure):
(JSC::DOMJITGetterBaseJSObject::create):
(JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::DOMJITAttribute):
(JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::slowCall):
(JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::callDOMGetter):
(JSC::DOMJITGetterBaseJSObject::customGetter):
(JSC::DOMJITGetterBaseJSObject::finishCreation):
(JSC::JSTestCustomGetterSetter::JSTestCustomGetterSetter):
(JSC::JSTestCustomGetterSetter::create):
(JSC::JSTestCustomGetterSetter::createStructure):
(JSC::customSetAccessor):
(JSC::customSetValue):
(JSC::JSTestCustomGetterSetter::finishCreation):
(JSC::Element::handleOwner):
(JSC::Element::finishCreation):
(JSC::WasmStreamingParser::WasmStreamingParser):
(JSC::WasmStreamingParser::create):
(JSC::WasmStreamingParser::createStructure):
(JSC::WasmStreamingParser::finishCreation):
(JSC::functionWasmStreamingParserAddBytes):
(JSC::functionWasmStreamingParserFinalize):
(JSC::functionCrash):
(JSC::functionBreakpoint):
(JSC::functionDFGTrue):
(JSC::functionFTLTrue):
(JSC::functionCpuMfence):
(JSC::functionCpuRdtsc):
(JSC::functionCpuCpuid):
(JSC::functionCpuPause):
(JSC::functionCpuClflush):
(JSC::CallerFrameJITTypeFunctor::CallerFrameJITTypeFunctor):
(JSC::getExecutableForFunction):
(JSC::functionLLintTrue):
(JSC::functionJITTrue):
(JSC::functionNoInline):
(JSC::functionGC):
(JSC::functionEdenGC):
(JSC::functionDumpSubspaceHashes):
(JSC::functionCallFrame):
(JSC::functionCodeBlockForFrame):
(JSC::codeBlockFromArg):
(JSC::functionCodeBlockFor):
(JSC::functionDumpSourceFor):
(JSC::functionDumpBytecodeFor):
(JSC::doPrint):
(JSC::functionDataLog):
(JSC::functionPrint):
(JSC::functionDumpCallFrame):
(JSC::functionDumpStack):
(JSC::functionDumpRegisters):
(JSC::functionDumpCell):
(JSC::functionIndexingMode):
(JSC::functionInlineCapacity):
(JSC::functionValue):
(JSC::functionGetPID):
(JSC::functionHaveABadTime):
(JSC::functionIsHavingABadTime):
(JSC::functionCreateGlobalObject):
(JSC::functionCreateProxy):
(JSC::functionCreateRuntimeArray):
(JSC::functionCreateNullRopeString):
(JSC::functionCreateImpureGetter):
(JSC::functionCreateCustomGetterObject):
(JSC::functionCreateDOMJITNodeObject):
(JSC::functionCreateDOMJITGetterObject):
(JSC::functionCreateDOMJITGetterComplexObject):
(JSC::functionCreateDOMJITFunctionObject):
(JSC::functionCreateDOMJITCheckSubClassObject):
(JSC::functionCreateDOMJITGetterBaseJSObject):
(JSC::functionCreateWasmStreamingParser):
(JSC::functionSetImpureGetterDelegate):
(JSC::functionCreateBuiltin):
(JSC::functionGetPrivateProperty):
(JSC::functionCreateRoot):
(JSC::functionCreateElement):
(JSC::functionGetElement):
(JSC::functionCreateSimpleObject):
(JSC::functionGetHiddenValue):
(JSC::functionSetHiddenValue):
(JSC::functionShadowChickenFunctionsOnStack):
(JSC::functionSetGlobalConstRedeclarationShouldNotThrow):
(JSC::functionFindTypeForExpression):
(JSC::functionReturnTypeFor):
(JSC::functionFlattenDictionaryObject):
(JSC::functionDumpBasicBlockExecutionRanges):
(JSC::functionHasBasicBlockExecuted):
(JSC::functionBasicBlockExecutionCount):
(JSC::functionEnableExceptionFuzz):
(JSC::changeDebuggerModeWhenIdle):
(JSC::functionEnableDebuggerModeWhenIdle):
(JSC::functionDisableDebuggerModeWhenIdle):
(JSC::functionDeleteAllCodeWhenIdle):
(JSC::functionGlobalObjectCount):
(JSC::functionGlobalObjectForObject):
(JSC::functionGetGetterSetter):
(JSC::functionLoadGetterFromGetterSetter):
(JSC::functionCreateCustomTestGetterSetter):
(JSC::functionDeltaBetweenButterflies):
(JSC::functionTotalGCTime):
(JSC::functionParseCount):
(JSC::functionIsWasmSupported):
(JSC::JSDollarVM::finishCreation):
(JSC::JSDollarVM::addFunction):
(JSC::JSDollarVM::addConstructibleFunction):

  • tools/JSDollarVM.h:

Source/WebCore:

No new tests. Covered by existing tests.

Enable Options::useDollarVM before we tell the JSGlobalObject to exposeDollarVM().
The $vm utility is now hardened to require that Options::useDollarVM be
enabled in order for it to be used.

  • testing/js/WebCoreTestSupport.cpp:

(WebCoreTestSupport::injectInternalsObject):

Source/WebKit:

Linux parts contributed by Carlos Garcia Campos <​cgarcia@igalia.com>.

  1. Add plumbing to allow WK2 tests to configureJSCForTesting().
  2. Removed the call enable Options::useBigInt in WebInspectorUI. WebInspectorUI doesn't really need it for now.
  • PluginProcess/unix/PluginProcessMainUnix.cpp:
  • Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:

(WebKit::XPCServiceInitializer):

  • Shared/unix/AuxiliaryProcessMain.cpp:

(WebKit::AuxiliaryProcessMainBase::parseCommandLine):

  • Shared/unix/AuxiliaryProcessMain.h:

(WebKit::AuxiliaryProcessMain):

  • UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::copy):

  • UIProcess/API/APIProcessPoolConfiguration.h:
  • UIProcess/API/C/WKContextConfigurationRef.cpp:

(WKContextConfigurationSetShouldConfigureJSCForTesting):

  • UIProcess/API/C/WKContextConfigurationRef.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
  • UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:

(-[_WKProcessPoolConfiguration configureJSCForTesting]):
(-[_WKProcessPoolConfiguration setConfigureJSCForTesting:]):

  • UIProcess/Launcher/ProcessLauncher.h:

(WebKit::ProcessLauncher::Client::shouldConfigureJSCForTesting const):

  • UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/Launcher/mac/ProcessLauncherMac.mm:

(WebKit::ProcessLauncher::launchProcess):

  • UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::shouldConfigureJSCForTesting const):

  • UIProcess/WebProcessProxy.h:
  • WebProcess/WebPage/WebInspectorUI.cpp:

(WebKit::WebInspectorUI::WebInspectorUI):

Source/WTF:

Add a source file that was missing so that Xcode can search its contents too.

  • WTF.xcodeproj/project.pbxproj:

Tools:

Linux parts contributed by Carlos Garcia Campos <​cgarcia@igalia.com>.
Windows parts contributed by Fujii Hironori <Fujii Hironori>.

Call JSC::Config::configureForTesting() in test harnesses or at the top of tests
to disable the hardening on test runs. Tests rely on setting options to enable
test features.

  • DumpRenderTree/mac/DumpRenderTree.mm:

(dumpRenderTree):

  • DumpRenderTree/win/DumpRenderTree.cpp:

(initialize):

  • TestWebKitAPI/PlatformUtilities.cpp:

(TestWebKitAPI::Util::createContextWithInjectedBundle):

  • TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:

(main):

  • TestWebKitAPI/Tests/WebKitCocoa/ApplePay.mm:

(TestWebKitAPI::TEST):
(TestWebKitAPI::runActiveSessionTest):

  • TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDiagnosticLogging.mm:

(TEST):

  • TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:

(TEST):

  • TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm:

(TestWebKitAPI::TEST):

  • TestWebKitAPI/WKWebViewConfigurationExtras.h:
  • TestWebKitAPI/WKWebViewConfigurationExtras.mm:

(+[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:]):
(+[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:configureJSCForTesting:]):

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::generateContextConfiguration const):

Location:
trunk
Files:
4 added
54 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/JSTests/ChangeLog

    r249780 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        Remove the call to forceGCSlowPaths().  This utility function will be removed.
     10        The modern way to set the required option is to use //@ requireOptions.
     11
     12        * stress/ftl-try-catch-oom-error-lazy-slow-path.js:
     13
    1142019-09-11  Yusuke Suzuki  <ysuzuki@apple.com>
    215

  • TabularUnified trunk/JSTests/stress/ftl-try-catch-oom-error-lazy-slow-path.js

    r192203 r249808  
    1 forceGCSlowPaths(); // Force OOM error in FTL MakeRope to happen in a lazy slow path.
     1//@ requireOptions("--forceGCSlowPaths=true")
     2
     3// We require --forceGCSlowPaths=true to force OOM error in FTL MakeRope to happen in a lazy slow path.
    24
    35function assert(b) {

  • TabularUnified trunk/Source/JavaScriptCore/API/glib/JSCOptions.cpp

    r243603 r249808  
    3232 *
    3333 * JavaScript options allow changing the behavior of the JavaScript engine.
    34  * They affect the way the engine works, so it's encouraged to set the options
     34 * They affect the way the engine works, so the options must be set
    3535 * at the very beginning of the program execution, before any other JavaScript
    3636 * API call. Most of the options are only useful for testing and debugging.
    … …  
    167167static gboolean jscOptionsSetValue(const char* option, const GValue* value)
    168168{
    169 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     169#define SET_OPTION_VALUE(type_, name_, defaultValue_, availability_, description_) \
    170170    if (!g_strcmp0(#name_, option)) {                                   \
    171         type_ valueToSet;                                               \
     171        OptionEntry::type_ valueToSet;                                  \
    172172        if (!valueFromGValue(value, valueToSet))                        \
    173173            return FALSE;                                               \
    … …  
    177177
    178178    Options::initialize();
    179     JSC_OPTIONS(FOR_EACH_OPTION)
    180 #undef FOR_EACH_OPTION
     179    FOR_EACH_JSC_OPTION(SET_OPTION_VALUE)
     180#undef SET_OPTION_VALUE
    181181
    182182    return FALSE;
    … …  
    185185static gboolean jscOptionsGetValue(const char* option, GValue* value)
    186186{
    187 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     187#define GET_OPTION_VALUE(type_, name_, defaultValue_, availability_, description_) \
    188188    if (!g_strcmp0(#name_, option)) {                                   \
    189         type_ valueToGet = Options::name_();                            \
     189        OptionEntry::type_ valueToGet = Options::name_();               \
    190190        valueToGValue(valueToGet, value);                               \
    191191        return TRUE;                                                    \
    … …  
    193193
    194194    Options::initialize();
    195     JSC_OPTIONS(FOR_EACH_OPTION)
    196 #undef FOR_EACH_OPTION
     195    FOR_EACH_JSC_OPTION(GET_OPTION_VALUE)
     196#undef GET_OPTION_VALUE
    197197
    198198    return FALSE;
    … …  
    615615    g_return_if_fail(function);
    616616
    617 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     617#define VISIT_OPTION(type_, name_, defaultValue_, availability_, description_) \
    618618    if (Options::Availability::availability_ == Options::Availability::Normal \
    619619        || Options::isAvailable(Options::name_##ID, Options::Availability::availability_)) { \
    620         type_ defaultValue { };                                         \
     620        OptionEntry::type_ defaultValue { };                            \
    621621        auto optionType = jscOptionsType(defaultValue);                 \
    622622        if (function (#name_, optionType, description_, userData))      \
    … …  
    625625
    626626    Options::initialize();
    627     JSC_OPTIONS(FOR_EACH_OPTION)
    628 #undef FOR_EACH_OPTION
     627    FOR_EACH_JSC_OPTION(VISIT_OPTION)
     628#undef VISIT_OPTION
    629629}
    630630
    … …  
    665665
    666666    GArray* entries = g_array_new(TRUE, TRUE, sizeof(GOptionEntry));
    667 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     667#define REGISTER_OPTION(type_, name_, defaultValue_, availability_, description_) \
    668668    if (Options::Availability::availability_ == Options::Availability::Normal \
    669669        || Options::isAvailable(Options::name_##ID, Options::Availability::availability_)) { \
    … …  
    679679
    680680    Options::initialize();
    681     JSC_OPTIONS(FOR_EACH_OPTION)
    682 #undef FOR_EACH_OPTION
     681    FOR_EACH_JSC_OPTION(REGISTER_OPTION)
     682#undef REGISTER_OPTION
    683683
    684684    g_option_group_add_entries(group, reinterpret_cast<GOptionEntry*>(entries->data));

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/testapi.c

    r247488 r249808  
    11/*
    2  * Copyright (C) 2006-2017 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2006-2019 Apple Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    7878#endif
    7979
     80void configureJSCForTesting(void);
    8081int testCAPIViaCpp(const char* filter);
    8182
    … …  
    13871388    SetErrorMode(0);
    13881389#endif
     1390
     1391    configureJSCForTesting();
    13891392
    13901393#if !OS(WINDOWS)

  • TabularUnified trunk/Source/JavaScriptCore/API/tests/testapi.cpp

    r249073 r249808  
    11/*
    2  * Copyright (C) 2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2017-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4040#include <wtf/text/StringCommon.h>
    4141
     42extern "C" void configureJSCForTesting();
    4243extern "C" int testCAPIViaCpp(const char* filter);
    4344
    … …  
    588589    callFunction("(function () { const p = Promise.reject(); Promise.resolve().then(() => { p.catch(() => {}); }); })");
    589590    check(!callbackCalled, "unhandled rejection callback should not be called for asynchronous early-handled rejection");
     591}
     592
     593void configureJSCForTesting()
     594{
     595    JSC::Config::configureForTesting();
    590596}
    591597

  • TabularUnified trunk/Source/JavaScriptCore/CMakeLists.txt

    r249547 r249808  
    843843    runtime/JSArrayBufferViewInlines.h
    844844    runtime/JSBigInt.h
     845    runtime/JSCConfig.h
    845846    runtime/JSCInlines.h
    846847    runtime/JSCJSValue.h
    … …  
    919920    runtime/ObjectPrototype.h
    920921    runtime/Operations.h
     922    runtime/OptionEntry.h
    921923    runtime/Options.h
     924    runtime/OptionsList.h
    922925    runtime/ParseInt.h
    923926    runtime/PrivateName.h

  • TabularUnified trunk/Source/JavaScriptCore/ChangeLog

    r249786 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        Linux parts contributed by Carlos Garcia Campos <cgarcia@igalia.com>.
     10
     11        1. Introduce a JSC::Config struct that will be protected as ReadOnly once the
     12           first VM instance is constructed.  The end of the VM constructor calls
     13           Config::permanentlyFreeze() which will make the Config ReadOnly.
     14
     15           Note: this is currently only supported for OS(DARWIN) and OS(LINUX).
     16           OS(WINDOWS) will need to implement some missing pieces before it can enable
     17           this hardening (see FIXME in JSCConfig.cpp).
     18
     19           The hardening strategy here is to put immutable global values into the Config.
     20           Any modifications that need to be made to these values must be done before the
     21           first VM instance is done instantiating.  This ensures that no script will
     22           ever run while the Config is still writable.
     23
     24           Also, the policy for this hardening is that a process is opted in by default.
     25           If there's a valid need to disable this hardening (e.g. for some test
     26           environments), the relevant process will need to opt itself out by calling
     27           Config::configureForTesting().
     28
     29           The jsc shell, WK2 UI and WebContent processes are opted in by default.
     30           Only test processes may be opt out.
     31
     32        2. Put all JSC::Options in the Config.  This enforces the invariant that options
     33           can only be changed before we instantiate a VM.  Once a VM is instantiated,
     34           the options are immutable.
     35
     36        3. Remove functionForceGCSlowPaths() from the jsc shell.  Setting
     37           Options::forceGCSlowPaths this way is no longer allowed.
     38
     39        4. Re-factored the Options code (Options.h) into:
     40           - OptionEntry.h: the data structure that stores the option values.
     41           - OptionsList.h: the list of options.
     42           - Options.h: the Options singleton object which is the interface for accessing options.
     43
     44           Renamed the JSC_OPTIONS macro to FOR_EACH_JSC_OPTION, because
     45           "FOR_EACH_JSC_OPTION(SET_OPTION_VALUE)" reads a lot better than
     46           "JSC_OPTIONS(FOR_EACH_OPTION)".
     47
     48        5. Change testapi to call Config::configureForTesting().  Parts of testapi makes
     49           use of setting options in its tests.  Hence, this hardening is disabled for
     50           testapi.
     51
     52           Note: the jsc shell does enable this hardening.
     53
     54        6. Put ExecutableAllocator's immutable globals in the Config.
     55
     56        7. RELEASE_ASSERT that restrictedOptionsEnabled in order to use the
     57           FunctionOverrides test utility.
     58
     59        8. RELEASE_ASSERT that Options::useDollarVM() is enabled in order to use the $vm.
     60
     61           We must RELEASE_ASSERT(Options::useDollarVM()) in all JSDollarVM functions
     62           that are non-trivial at an eye's glance.  This includes (but is not limited to):
     63               constructors
     64               create() factory
     65               createStructure() factory
     66               finishCreation()
     67               HOST_CALL or operation functions
     68               Constructors and methods of utility and test classes
     69
     70           The only exception are some constexpr constructors used for instantiating
     71           globals (since these must have trivial constructors) e.g. DOMJITAttribute.
     72           Instead, these constructors should always be ALWAYS_INLINE.
     73
     74        * API/glib/JSCOptions.cpp:
     75        (jscOptionsSetValue):
     76        (jscOptionsGetValue):
     77        (jsc_options_foreach):
     78        (jsc_options_get_option_group):
     79        * API/tests/testapi.c:
     80        (main):
     81        * API/tests/testapi.cpp:
     82        (configureJSCForTesting):
     83        * CMakeLists.txt:
     84        * JavaScriptCore.xcodeproj/project.pbxproj:
     85        * Sources.txt:
     86        * jit/ExecutableAllocator.cpp:
     87        (JSC::isJITEnabled):
     88        (JSC::ExecutableAllocator::setJITEnabled):
     89        (JSC::ExecutableAllocator::initializeUnderlyingAllocator):
     90        (JSC::ExecutableAllocator::isValid const):
     91        (JSC::ExecutableAllocator::underMemoryPressure):
     92        (JSC::ExecutableAllocator::memoryPressureMultiplier):
     93        (JSC::ExecutableAllocator::allocate):
     94        (JSC::ExecutableAllocator::isValidExecutableMemory):
     95        (JSC::ExecutableAllocator::getLock const):
     96        (JSC::ExecutableAllocator::committedByteCount):
     97        (JSC::ExecutableAllocator::dumpProfile):
     98        (JSC::startOfFixedExecutableMemoryPoolImpl):
     99        (JSC::endOfFixedExecutableMemoryPoolImpl):
     100        (JSC::isJITPC):
     101        (JSC::dumpJITMemory):
     102        (JSC::ExecutableAllocator::initialize):
     103        (JSC::ExecutableAllocator::singleton):
     104        * jit/ExecutableAllocator.h:
     105        (JSC::performJITMemcpy):
     106        * jsc.cpp:
     107        (GlobalObject::finishCreation):
     108        (functionJSCOptions):
     109        (jscmain):
     110        (functionForceGCSlowPaths): Deleted.
     111        * runtime/ConfigFile.cpp:
     112        (JSC::ConfigFile::parse):
     113        * runtime/InitializeThreading.cpp:
     114        (JSC::initializeThreading):
     115        * runtime/JSCConfig.cpp: Added.
     116        (JSC::Config::disableFreezingForTesting):
     117        (JSC::Config::enableRestrictedOptions):
     118        (JSC::Config::permanentlyFreeze):
     119        * runtime/JSCConfig.h: Added.
     120        (JSC::Config::configureForTesting):
     121        * runtime/JSGlobalObject.cpp:
     122        (JSC::JSGlobalObject::exposeDollarVM):
     123        * runtime/OptionEntry.h: Added.
     124        (JSC::OptionRange::operator= ):
     125        (JSC::OptionRange::rangeString const):
     126        * runtime/Options.cpp:
     127        (JSC::Options::isAvailable):
     128        (JSC::scaleJITPolicy):
     129        (JSC::Options::initialize):
     130        (JSC::Options::setOptions):
     131        (JSC::Options::setOptionWithoutAlias):
     132        (JSC::Options::setAliasedOption):
     133        (JSC::Option::dump const):
     134        (JSC::Option::operator== const):
     135        (): Deleted.
     136        (JSC::Options::enableRestrictedOptions): Deleted.
     137        * runtime/Options.h:
     138        (JSC::Option::Option):
     139        (JSC::Option::defaultOption const):
     140        (JSC::Option::boolVal):
     141        (JSC::Option::unsignedVal):
     142        (JSC::Option::doubleVal):
     143        (JSC::Option::int32Val):
     144        (JSC::Option::optionRangeVal):
     145        (JSC::Option::optionStringVal):
     146        (JSC::Option::gcLogLevelVal):
     147        (JSC::OptionRange::operator= ): Deleted.
     148        (JSC::OptionRange::rangeString const): Deleted.
     149        * runtime/OptionsList.h: Added.
     150        (JSC::countNumberOfJSCOptions):
     151        * runtime/VM.cpp:
     152        (JSC::VM::VM):
     153        * tools/FunctionOverrides.cpp:
     154        (JSC::FunctionOverrides::FunctionOverrides):
     155        (JSC::FunctionOverrides::reinstallOverrides):
     156        (JSC::FunctionOverrides::initializeOverrideFor):
     157        (JSC::FunctionOverrides::parseOverridesInFile):
     158        * tools/JSDollarVM.cpp:
     159        (JSC::JSDollarVMCallFrame::JSDollarVMCallFrame):
     160        (JSC::JSDollarVMCallFrame::createStructure):
     161        (JSC::JSDollarVMCallFrame::create):
     162        (JSC::JSDollarVMCallFrame::finishCreation):
     163        (JSC::JSDollarVMCallFrame::addProperty):
     164        (JSC::Element::Element):
     165        (JSC::Element::create):
     166        (JSC::Element::createStructure):
     167        (JSC::Root::Root):
     168        (JSC::Root::create):
     169        (JSC::Root::createStructure):
     170        (JSC::SimpleObject::SimpleObject):
     171        (JSC::SimpleObject::create):
     172        (JSC::SimpleObject::createStructure):
     173        (JSC::ImpureGetter::ImpureGetter):
     174        (JSC::ImpureGetter::createStructure):
     175        (JSC::ImpureGetter::create):
     176        (JSC::ImpureGetter::finishCreation):
     177        (JSC::ImpureGetter::getOwnPropertySlot):
     178        (JSC::CustomGetter::CustomGetter):
     179        (JSC::CustomGetter::createStructure):
     180        (JSC::CustomGetter::create):
     181        (JSC::CustomGetter::getOwnPropertySlot):
     182        (JSC::CustomGetter::customGetter):
     183        (JSC::CustomGetter::customGetterAcessor):
     184        (JSC::RuntimeArray::create):
     185        (JSC::RuntimeArray::destroy):
     186        (JSC::RuntimeArray::getOwnPropertySlot):
     187        (JSC::RuntimeArray::getOwnPropertySlotByIndex):
     188        (JSC::RuntimeArray::createPrototype):
     189        (JSC::RuntimeArray::createStructure):
     190        (JSC::RuntimeArray::finishCreation):
     191        (JSC::RuntimeArray::RuntimeArray):
     192        (JSC::RuntimeArray::lengthGetter):
     193        (JSC::DOMJITNode::DOMJITNode):
     194        (JSC::DOMJITNode::createStructure):
     195        (JSC::DOMJITNode::checkSubClassSnippet):
     196        (JSC::DOMJITNode::create):
     197        (JSC::DOMJITGetter::DOMJITGetter):
     198        (JSC::DOMJITGetter::createStructure):
     199        (JSC::DOMJITGetter::create):
     200        (JSC::DOMJITGetter::DOMJITAttribute::DOMJITAttribute):
     201        (JSC::DOMJITGetter::DOMJITAttribute::slowCall):
     202        (JSC::DOMJITGetter::DOMJITAttribute::callDOMGetter):
     203        (JSC::DOMJITGetter::customGetter):
     204        (JSC::DOMJITGetter::finishCreation):
     205        (JSC::DOMJITGetterComplex::DOMJITGetterComplex):
     206        (JSC::DOMJITGetterComplex::createStructure):
     207        (JSC::DOMJITGetterComplex::create):
     208        (JSC::DOMJITGetterComplex::DOMJITAttribute::DOMJITAttribute):
     209        (JSC::DOMJITGetterComplex::DOMJITAttribute::slowCall):
     210        (JSC::DOMJITGetterComplex::DOMJITAttribute::callDOMGetter):
     211        (JSC::DOMJITGetterComplex::functionEnableException):
     212        (JSC::DOMJITGetterComplex::customGetter):
     213        (JSC::DOMJITGetterComplex::finishCreation):
     214        (JSC::DOMJITFunctionObject::DOMJITFunctionObject):
     215        (JSC::DOMJITFunctionObject::createStructure):
     216        (JSC::DOMJITFunctionObject::create):
     217        (JSC::DOMJITFunctionObject::functionWithTypeCheck):
     218        (JSC::DOMJITFunctionObject::functionWithoutTypeCheck):
     219        (JSC::DOMJITFunctionObject::checkSubClassSnippet):
     220        (JSC::DOMJITFunctionObject::finishCreation):
     221        (JSC::DOMJITCheckSubClassObject::DOMJITCheckSubClassObject):
     222        (JSC::DOMJITCheckSubClassObject::createStructure):
     223        (JSC::DOMJITCheckSubClassObject::create):
     224        (JSC::DOMJITCheckSubClassObject::functionWithTypeCheck):
     225        (JSC::DOMJITCheckSubClassObject::functionWithoutTypeCheck):
     226        (JSC::DOMJITCheckSubClassObject::finishCreation):
     227        (JSC::DOMJITGetterBaseJSObject::DOMJITGetterBaseJSObject):
     228        (JSC::DOMJITGetterBaseJSObject::createStructure):
     229        (JSC::DOMJITGetterBaseJSObject::create):
     230        (JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::DOMJITAttribute):
     231        (JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::slowCall):
     232        (JSC::DOMJITGetterBaseJSObject::DOMJITAttribute::callDOMGetter):
     233        (JSC::DOMJITGetterBaseJSObject::customGetter):
     234        (JSC::DOMJITGetterBaseJSObject::finishCreation):
     235        (JSC::JSTestCustomGetterSetter::JSTestCustomGetterSetter):
     236        (JSC::JSTestCustomGetterSetter::create):
     237        (JSC::JSTestCustomGetterSetter::createStructure):
     238        (JSC::customSetAccessor):
     239        (JSC::customSetValue):
     240        (JSC::JSTestCustomGetterSetter::finishCreation):
     241        (JSC::Element::handleOwner):
     242        (JSC::Element::finishCreation):
     243        (JSC::WasmStreamingParser::WasmStreamingParser):
     244        (JSC::WasmStreamingParser::create):
     245        (JSC::WasmStreamingParser::createStructure):
     246        (JSC::WasmStreamingParser::finishCreation):
     247        (JSC::functionWasmStreamingParserAddBytes):
     248        (JSC::functionWasmStreamingParserFinalize):
     249        (JSC::functionCrash):
     250        (JSC::functionBreakpoint):
     251        (JSC::functionDFGTrue):
     252        (JSC::functionFTLTrue):
     253        (JSC::functionCpuMfence):
     254        (JSC::functionCpuRdtsc):
     255        (JSC::functionCpuCpuid):
     256        (JSC::functionCpuPause):
     257        (JSC::functionCpuClflush):
     258        (JSC::CallerFrameJITTypeFunctor::CallerFrameJITTypeFunctor):
     259        (JSC::getExecutableForFunction):
     260        (JSC::functionLLintTrue):
     261        (JSC::functionJITTrue):
     262        (JSC::functionNoInline):
     263        (JSC::functionGC):
     264        (JSC::functionEdenGC):
     265        (JSC::functionDumpSubspaceHashes):
     266        (JSC::functionCallFrame):
     267        (JSC::functionCodeBlockForFrame):
     268        (JSC::codeBlockFromArg):
     269        (JSC::functionCodeBlockFor):
     270        (JSC::functionDumpSourceFor):
     271        (JSC::functionDumpBytecodeFor):
     272        (JSC::doPrint):
     273        (JSC::functionDataLog):
     274        (JSC::functionPrint):
     275        (JSC::functionDumpCallFrame):
     276        (JSC::functionDumpStack):
     277        (JSC::functionDumpRegisters):
     278        (JSC::functionDumpCell):
     279        (JSC::functionIndexingMode):
     280        (JSC::functionInlineCapacity):
     281        (JSC::functionValue):
     282        (JSC::functionGetPID):
     283        (JSC::functionHaveABadTime):
     284        (JSC::functionIsHavingABadTime):
     285        (JSC::functionCreateGlobalObject):
     286        (JSC::functionCreateProxy):
     287        (JSC::functionCreateRuntimeArray):
     288        (JSC::functionCreateNullRopeString):
     289        (JSC::functionCreateImpureGetter):
     290        (JSC::functionCreateCustomGetterObject):
     291        (JSC::functionCreateDOMJITNodeObject):
     292        (JSC::functionCreateDOMJITGetterObject):
     293        (JSC::functionCreateDOMJITGetterComplexObject):
     294        (JSC::functionCreateDOMJITFunctionObject):
     295        (JSC::functionCreateDOMJITCheckSubClassObject):
     296        (JSC::functionCreateDOMJITGetterBaseJSObject):
     297        (JSC::functionCreateWasmStreamingParser):
     298        (JSC::functionSetImpureGetterDelegate):
     299        (JSC::functionCreateBuiltin):
     300        (JSC::functionGetPrivateProperty):
     301        (JSC::functionCreateRoot):
     302        (JSC::functionCreateElement):
     303        (JSC::functionGetElement):
     304        (JSC::functionCreateSimpleObject):
     305        (JSC::functionGetHiddenValue):
     306        (JSC::functionSetHiddenValue):
     307        (JSC::functionShadowChickenFunctionsOnStack):
     308        (JSC::functionSetGlobalConstRedeclarationShouldNotThrow):
     309        (JSC::functionFindTypeForExpression):
     310        (JSC::functionReturnTypeFor):
     311        (JSC::functionFlattenDictionaryObject):
     312        (JSC::functionDumpBasicBlockExecutionRanges):
     313        (JSC::functionHasBasicBlockExecuted):
     314        (JSC::functionBasicBlockExecutionCount):
     315        (JSC::functionEnableExceptionFuzz):
     316        (JSC::changeDebuggerModeWhenIdle):
     317        (JSC::functionEnableDebuggerModeWhenIdle):
     318        (JSC::functionDisableDebuggerModeWhenIdle):
     319        (JSC::functionDeleteAllCodeWhenIdle):
     320        (JSC::functionGlobalObjectCount):
     321        (JSC::functionGlobalObjectForObject):
     322        (JSC::functionGetGetterSetter):
     323        (JSC::functionLoadGetterFromGetterSetter):
     324        (JSC::functionCreateCustomTestGetterSetter):
     325        (JSC::functionDeltaBetweenButterflies):
     326        (JSC::functionTotalGCTime):
     327        (JSC::functionParseCount):
     328        (JSC::functionIsWasmSupported):
     329        (JSC::JSDollarVM::finishCreation):
     330        (JSC::JSDollarVM::addFunction):
     331        (JSC::JSDollarVM::addConstructibleFunction):
     332        * tools/JSDollarVM.h:
     333
    13342019-09-11  Devin Rousso  <drousso@apple.com>
    2335

  • TabularUnified trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r249708 r249808  
    114114                E1AC2E2720F7B94C00B0897D /* Unlock Keychain */ = {
    115115                        isa = PBXAggregateTarget;
    116                         buildConfigurationList = 14CFB10523035EF300F0048C /* Build configuration list */;
     116                        buildConfigurationList = 14CFB10523035EF300F0048C /* Build configuration list for PBXAggregateTarget "Unlock Keychain" */;
    117117                        buildPhases = (
    118118                                E1AC2E2C20F7B95800B0897D /* Unlock Keychain */,
    … …  
    18721872                FE318FE01CAC982F00DFCC54 /* ECMAScriptSpecInternalFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = FE318FDE1CAC8C5300DFCC54 /* ECMAScriptSpecInternalFunctions.h */; };
    18731873                FE3422121D6B81C30032BE88 /* ThrowScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3422111D6B818C0032BE88 /* ThrowScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1874                FE3842322324D51B009DD445 /* OptionEntry.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3842302324D51A009DD445 /* OptionEntry.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1875                FE3842332324D51B009DD445 /* OptionsList.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3842312324D51B009DD445 /* OptionsList.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18741876                FE384EE61ADDB7AD0055DE2C /* JSDollarVM.h in Headers */ = {isa = PBXBuildFile; fileRef = FE384EE21ADDB7AD0055DE2C /* JSDollarVM.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18751877                FE3A06A61C10B72D00390FDD /* JITBitOrGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */; };
    … …  
    18801882                FE3A06C01C11041A00390FDD /* JITRightShiftGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06B91C1103D900390FDD /* JITRightShiftGenerator.h */; };
    18811883                FE476FF4207E85D50093CA2D /* JITCodeMap.h in Headers */ = {isa = PBXBuildFile; fileRef = FE476FF3207E85D40093CA2D /* JITCodeMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
     1884                FE48BD4423245E9300F136D0 /* JSCConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = FE48BD4223245E8700F136D0 /* JSCConfig.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18821885                FE48E6381EB118D2005D7A96 /* ObjectInitializationScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FE48E6361EB1188F005D7A96 /* ObjectInitializationScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
    18831886                FE4BFF2C1AD476E700088F87 /* FunctionOverrides.h in Headers */ = {isa = PBXBuildFile; fileRef = FE4BFF2A1AD476E700088F87 /* FunctionOverrides.h */; };
    … …  
    19221925                        filePatterns = "*.h";
    19231926                        fileType = pattern.proxy;
     1927                        inputFiles = (
     1928                        );
    19241929                        isEditable = 1;
    19251930                        outputFiles = (
    … …  
    50635068                FE35C2FB21B1E6C7000F4CA8 /* OpcodeGroup.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = OpcodeGroup.rb; sourceTree = "<group>"; };
    50645069                FE35C2FC21B1E6C7000F4CA8 /* Metadata.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = Metadata.rb; sourceTree = "<group>"; };
     5070                FE3842302324D51A009DD445 /* OptionEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionEntry.h; sourceTree = "<group>"; };
     5071                FE3842312324D51B009DD445 /* OptionsList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsList.h; sourceTree = "<group>"; };
    50655072                FE384EE11ADDB7AD0055DE2C /* JSDollarVM.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDollarVM.cpp; sourceTree = "<group>"; };
    50665073                FE384EE21ADDB7AD0055DE2C /* JSDollarVM.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDollarVM.h; sourceTree = "<group>"; };
    … …  
    50785085                FE42388F1BE18C1200514737 /* JITSubGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITSubGenerator.cpp; sourceTree = "<group>"; };
    50795086                FE476FF3207E85D40093CA2D /* JITCodeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITCodeMap.h; sourceTree = "<group>"; };
     5087                FE48BD4223245E8700F136D0 /* JSCConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JSCConfig.h; sourceTree = "<group>"; };
     5088                FE48BD4323245E8700F136D0 /* JSCConfig.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = JSCConfig.cpp; sourceTree = "<group>"; };
    50805089                FE48E6361EB1188F005D7A96 /* ObjectInitializationScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectInitializationScope.h; sourceTree = "<group>"; };
    50815090                FE48E6371EB118AD005D7A96 /* ObjectInitializationScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectInitializationScope.cpp; sourceTree = "<group>"; };
    … …  
    71357144                                86FA9E8F142BBB2D001773B7 /* JSBoundFunction.cpp */,
    71367145                                86FA9E90142BBB2E001773B7 /* JSBoundFunction.h */,
     7146                                FE48BD4323245E8700F136D0 /* JSCConfig.cpp */,
     7147                                FE48BD4223245E8700F136D0 /* JSCConfig.h */,
    71377148                                657CF45619BF6662004ACBF2 /* JSCallee.cpp */,
    71387149                                657CF45719BF6662004ACBF2 /* JSCallee.h */,
    … …  
    73557366                                F692A8770255597D01FF60F7 /* Operations.cpp */,
    73567367                                F692A8780255597D01FF60F7 /* Operations.h */,
     7368                                FE3842302324D51A009DD445 /* OptionEntry.h */,
    73577369                                0FE228EA1436AB2300196C48 /* Options.cpp */,
    73587370                                0FE228EB1436AB2300196C48 /* Options.h */,
     7371                                FE3842312324D51B009DD445 /* OptionsList.h */,
    73597372                                37C738D11EDB5672003F2B0B /* ParseInt.h */,
    73607373                                868916A9155F285400CB2B9A /* PrivateName.h */,
    … …  
    93369349                                A7D89D0217A0B90400773AD8 /* FTLLoweredNodeValue.h in Headers */,
    93379350                                0F2B9CF919D0BAC100B1D1B5 /* FTLOperations.h in Headers */,
     9351                                FE3842322324D51B009DD445 /* OptionEntry.h in Headers */,
    93389352                                0FD8A31C17D51F2200CA2C40 /* FTLOSREntry.h in Headers */,
    93399353                                0F235BDD17178E1C00690C7F /* FTLOSRExit.h in Headers */,
    … …  
    95259539                                A125846F1B45A36000CC7F6C /* IntlNumberFormatPrototype.lut.h in Headers */,
    95269540                                A12BBFF21B044A8B00664B69 /* IntlObject.h in Headers */,
     9541                                FE48BD4423245E9300F136D0 /* JSCConfig.h in Headers */,
    95279542                                708EBE241CE8F35800453146 /* IntlObjectInlines.h in Headers */,
    95289543                                860BD801148EA6F200112B2F /* Intrinsic.h in Headers */,
    … …  
    99789993                                0FE050291AA9095600D33B33 /* ScopedArgumentsTable.h in Headers */,
    99799994                                0FE0502B1AA9095600D33B33 /* ScopeOffset.h in Headers */,
     9995                                FE3842332324D51B009DD445 /* OptionsList.h in Headers */,
    99809996                                0F24E55217EE274900ABB217 /* ScratchRegisterAllocator.h in Headers */,
    99819997                                A5FD0068189AFE9C00633231 /* ScriptArguments.h in Headers */,
    … …  
    1219212208                        defaultConfigurationName = Production;
    1219312209                };
    12194                 14CFB10523035EF300F0048C /* Build configuration list */ = {
     12210                14CFB10523035EF300F0048C /* Build configuration list for PBXAggregateTarget "Unlock Keychain" */ = {
    1219512211                        isa = XCConfigurationList;
    1219612212                        buildConfigurations = (

  • TabularUnified trunk/Source/JavaScriptCore/Sources.txt

    r249708 r249808  
    734734runtime/CommonSlowPaths.cpp
    735735runtime/CompilationResult.cpp
    736 tools/CompilerTimingScope.cpp
    737736runtime/Completion.cpp
    738737runtime/ConfigFile.cpp
    … …  
    814813runtime/JSBigInt.cpp
    815814runtime/JSBoundFunction.cpp
     815runtime/JSCConfig.cpp
    816816runtime/JSCJSValue.cpp
    817817runtime/JSCPtrTag.cpp
    … …  
    985985tools/CodeProfile.cpp
    986986tools/CodeProfiling.cpp
     987tools/CompilerTimingScope.cpp
    987988tools/FunctionOverrides.cpp
    988989tools/FunctionWhitelist.cpp

  • TabularUnified trunk/Source/JavaScriptCore/jit/ExecutableAllocator.cpp

    r248687 r249808  
    9393
    9494#if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0
    95 static const size_t fixedExecutableMemoryPoolSize = FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB * 1024 * 1024;
     95static constexpr size_t fixedExecutableMemoryPoolSize = FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB * 1024 * 1024;
    9696#elif CPU(ARM)
    97 static const size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
     97static constexpr size_t fixedExecutableMemoryPoolSize = 16 * 1024 * 1024;
    9898#elif CPU(ARM64)
    99 static const size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024;
     99static constexpr size_t fixedExecutableMemoryPoolSize = 128 * 1024 * 1024;
    100100#elif CPU(X86_64)
    101 static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
     101static constexpr size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
    102102#else
    103 static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
     103static constexpr size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
    104104#endif
    105105
    106106#if CPU(ARM)
    107 static const double executablePoolReservationFraction = 0.15;
     107static constexpr double executablePoolReservationFraction = 0.15;
    108108#else
    109 static const double executablePoolReservationFraction = 0.25;
    110 #endif
    111 
    112 #if ENABLE(SEPARATED_WX_HEAP)
    113 JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy { false };
    114 JS_EXPORT_PRIVATE JITWriteSeparateHeapsFunction jitWriteSeparateHeapsFunction;
    115 #endif
    116 
    117 #if !USE(EXECUTE_ONLY_JIT_WRITE_FUNCTION) && HAVE(REMAP_JIT)
    118 static uintptr_t startOfFixedWritableMemoryPool;
    119 #endif
    120 
    121 class FixedVMPoolExecutableAllocator;
    122 static FixedVMPoolExecutableAllocator* allocator = nullptr;
    123 
    124 static bool s_isJITEnabled = true;
     109static constexpr double executablePoolReservationFraction = 0.25;
     110#endif
     111
    125112static bool isJITEnabled()
    126113{
     114    bool jitEnabled = !g_jscConfig.jitDisabled;
    127115#if PLATFORM(IOS_FAMILY) && (CPU(ARM64) || CPU(ARM))
    128     return processHasEntitlement("dynamic-codesigning") && s_isJITEnabled;
     116    return processHasEntitlement("dynamic-codesigning") && jitEnabled;
    129117#else
    130     return s_isJITEnabled;
     118    return jitEnabled;
    131119#endif
    132120}
    … …  
    134122void ExecutableAllocator::setJITEnabled(bool enabled)
    135123{
    136     ASSERT(!allocator);
    137     if (s_isJITEnabled == enabled)
     124    bool jitEnabled = !g_jscConfig.jitDisabled;
     125    ASSERT(!g_jscConfig.fixedVMPoolExecutableAllocator);
     126    if (jitEnabled == enabled)
    138127        return;
    139128
    140     s_isJITEnabled = enabled;
     129    g_jscConfig.jitDisabled = !enabled;
    141130
    142131#if PLATFORM(IOS_FAMILY) && (CPU(ARM64) || CPU(ARM))
    … …  
    194183#if ENABLE(FAST_JIT_PERMISSIONS)
    195184            if (os_thread_self_restrict_rwx_is_supported()) {
    196                 useFastPermisionsJITCopy = true;
     185                g_jscConfig.useFastPermisionsJITCopy = true;
    197186                os_thread_self_restrict_rwx_to_rx();
    198187            } else
    … …  
    213202            void* reservationEnd = reinterpret_cast<uint8_t*>(reservationBase) + reservationSize;
    214203
    215             m_memoryStart = MacroAssemblerCodePtr<ExecutableMemoryPtrTag>(tagCodePtr<ExecutableMemoryPtrTag>(reservationBase));
    216             m_memoryEnd = MacroAssemblerCodePtr<ExecutableMemoryPtrTag>(tagCodePtr<ExecutableMemoryPtrTag>(reservationEnd));
     204            g_jscConfig.startExecutableMemory = tagCodePtr<ExecutableMemoryPtrTag>(reservationBase);
     205            g_jscConfig.endExecutableMemory = tagCodePtr<ExecutableMemoryPtrTag>(reservationEnd);
    217206        }
    218207    }
    … …  
    220209    virtual ~FixedVMPoolExecutableAllocator();
    221210
    222     void* memoryStart() { return m_memoryStart.untaggedExecutableAddress(); }
    223     void* memoryEnd() { return m_memoryEnd.untaggedExecutableAddress(); }
     211    void* memoryStart() { return untagCodePtr<ExecutableMemoryPtrTag>(g_jscConfig.startExecutableMemory); }
     212    void* memoryEnd() { return untagCodePtr<ExecutableMemoryPtrTag>(g_jscConfig.endExecutableMemory); }
    224213    bool isJITPC(void* pc) { return memoryStart() <= pc && pc < memoryEnd(); }
    225214
    … …  
    303292
    304293#if ENABLE(SEPARATED_WX_HEAP)
    305         jitWriteSeparateHeapsFunction = reinterpret_cast<JITWriteSeparateHeapsFunction>(writeThunk.code().executableAddress());
     294        g_jscConfig.jitWriteSeparateHeaps = reinterpret_cast<JITWriteSeparateHeapsFunction>(writeThunk.code().executableAddress());
    306295#endif
    307296    }
    … …  
    382371    static void genericWriteToJITRegion(off_t offset, const void* data, size_t dataSize)
    383372    {
    384         memcpy((void*)(startOfFixedWritableMemoryPool + offset), data, dataSize);
     373        memcpy((void*)(g_jscConfig.startOfFixedWritableMemoryPool + offset), data, dataSize);
    385374    }
    386375
    387376    MacroAssemblerCodeRef<JITThunkPtrTag> jitWriteThunkGenerator(void* address, void*, size_t)
    388377    {
    389         startOfFixedWritableMemoryPool = reinterpret_cast<uintptr_t>(address);
     378        g_jscConfig.startOfFixedWritableMemoryPool = reinterpret_cast<uintptr_t>(address);
    390379        void* function = reinterpret_cast<void*>(&genericWriteToJITRegion);
    391380#if CPU(ARM_THUMB2)
    … …  
    408397private:
    409398    PageReservation m_reservation;
    410     MacroAssemblerCodePtr<ExecutableMemoryPtrTag> m_memoryStart;
    411     MacroAssemblerCodePtr<ExecutableMemoryPtrTag> m_memoryEnd;
    412399};
    413400
    … …  
    419406void ExecutableAllocator::initializeUnderlyingAllocator()
    420407{
    421     ASSERT(!allocator);
    422     allocator = new FixedVMPoolExecutableAllocator();
    423     CodeProfiling::notifyAllocator(allocator);
     408    RELEASE_ASSERT(!g_jscConfig.fixedVMPoolExecutableAllocator);
     409    g_jscConfig.fixedVMPoolExecutableAllocator = new FixedVMPoolExecutableAllocator();
     410    CodeProfiling::notifyAllocator(g_jscConfig.fixedVMPoolExecutableAllocator);
    424411}
    425412
    426413bool ExecutableAllocator::isValid() const
    427414{
     415    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    428416    if (!allocator)
    429417        return Base::isValid();
    … …  
    433421bool ExecutableAllocator::underMemoryPressure()
    434422{
     423    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    435424    if (!allocator)
    436425        return Base::underMemoryPressure();
    … …  
    440429double ExecutableAllocator::memoryPressureMultiplier(size_t addedMemoryUsage)
    441430{
     431    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    442432    if (!allocator)
    443433        return Base::memoryPressureMultiplier(addedMemoryUsage);
    … …  
    459449RefPtr<ExecutableMemoryHandle> ExecutableAllocator::allocate(size_t sizeInBytes, void* ownerUID, JITCompilationEffort effort)
    460450{
     451    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    461452    if (!allocator)
    462453        return Base::allocate(sizeInBytes, ownerUID, effort);
    … …  
    496487    }
    497488
    498 #if CPU(ARM64E)
    499489    void* start = allocator->memoryStart();
    500490    void* end = allocator->memoryEnd();
    … …  
    503493    RELEASE_ASSERT(start <= resultStart && resultStart < end);
    504494    RELEASE_ASSERT(start < resultEnd && resultEnd <= end);
    505 #endif
    506495    return result;
    507496}
    … …  
    509498bool ExecutableAllocator::isValidExecutableMemory(const AbstractLocker& locker, void* address)
    510499{
     500    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    511501    if (!allocator)
    512502        return Base::isValidExecutableMemory(locker, address);
    … …  
    516506Lock& ExecutableAllocator::getLock() const
    517507{
     508    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    518509    if (!allocator)
    519510        return Base::getLock();
    … …  
    523514size_t ExecutableAllocator::committedByteCount()
    524515{
     516    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    525517    if (!allocator)
    526518        return Base::committedByteCount();
    … …  
    531523void ExecutableAllocator::dumpProfile()
    532524{
     525    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    533526    if (!allocator)
    534527        return;
    … …  
    539532void* startOfFixedExecutableMemoryPoolImpl()
    540533{
     534    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    541535    if (!allocator)
    542536        return nullptr;
    … …  
    546540void* endOfFixedExecutableMemoryPoolImpl()
    547541{
     542    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    548543    if (!allocator)
    549544        return nullptr;
    … …  
    553548bool isJITPC(void* pc)
    554549{
     550    auto* allocator = g_jscConfig.fixedVMPoolExecutableAllocator;
    555551    return allocator && allocator->isJITPC(pc);
    556552}
    … …  
    558554void dumpJITMemory(const void* dst, const void* src, size_t size)
    559555{
    560     ASSERT(Options::dumpJITMemoryPath());
     556    RELEASE_ASSERT(Options::dumpJITMemoryPath());
    561557
    562558#if OS(DARWIN)
    … …  
    636632namespace JSC {
    637633
    638 static ExecutableAllocator* executableAllocator;
    639 
    640634void ExecutableAllocator::initialize()
    641635{
    642     executableAllocator = new ExecutableAllocator;
     636    g_jscConfig.executableAllocator = new ExecutableAllocator;
    643637}
    644638
    645639ExecutableAllocator& ExecutableAllocator::singleton()
    646640{
    647     ASSERT(executableAllocator);
    648     return *executableAllocator;
     641    ASSERT(g_jscConfig.executableAllocator);
     642    return *g_jscConfig.executableAllocator;
    649643}
    650644

  • TabularUnified trunk/Source/JavaScriptCore/jit/ExecutableAllocator.h

    r249613 r249808  
    11/*
    2  * Copyright (C) 2008-2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2008-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2727
    2828#include "JITCompilationEffort.h"
     29#include "JSCConfig.h"
    2930#include "JSCPtrTag.h"
    3031#include "Options.h"
    … …  
    116117JS_EXPORT_PRIVATE void dumpJITMemory(const void*, const void*, size_t);
    117118
    118 #if ENABLE(SEPARATED_WX_HEAP)
    119 
    120 typedef void (*JITWriteSeparateHeapsFunction)(off_t, const void*, size_t);
    121 extern JS_EXPORT_PRIVATE JITWriteSeparateHeapsFunction jitWriteSeparateHeapsFunction;
    122 extern JS_EXPORT_PRIVATE bool useFastPermisionsJITCopy;
    123 
    124 #endif // ENABLE(SEPARATED_WX_HEAP)
    125 
    126119static ALWAYS_INLINE void* performJITMemcpy(void *dst, const void *src, size_t n)
    127120{
    … …  
    139132#if ENABLE(FAST_JIT_PERMISSIONS)
    140133#if ENABLE(SEPARATED_WX_HEAP)
    141         if (useFastPermisionsJITCopy)
     134        if (g_jscConfig.useFastPermisionsJITCopy)
    142135#endif
    143136        {
    … …  
    150143
    151144#if ENABLE(SEPARATED_WX_HEAP)
    152         if (jitWriteSeparateHeapsFunction) {
     145        if (g_jscConfig.jitWriteSeparateHeaps) {
    153146            // Use execute-only write thunk for writes inside the JIT region. This is a variant of
    154147            // memcpy that takes an offset into the JIT region as its destination (first) parameter.
    155148            off_t offset = (off_t)((uintptr_t)dst - startOfFixedExecutableMemoryPool<uintptr_t>());
    156             retagCodePtr<JITThunkPtrTag, CFunctionPtrTag>(jitWriteSeparateHeapsFunction)(offset, src, n);
     149            retagCodePtr<JITThunkPtrTag, CFunctionPtrTag>(g_jscConfig.jitWriteSeparateHeaps)(offset, src, n);
    157150            return dst;
    158151        }

  • TabularUnified trunk/Source/JavaScriptCore/jsc.cpp

    r249661 r249808  
    302302static EncodedJSValue JSC_HOST_CALL functionFullGC(ExecState*);
    303303static EncodedJSValue JSC_HOST_CALL functionEdenGC(ExecState*);
    304 static EncodedJSValue JSC_HOST_CALL functionForceGCSlowPaths(ExecState*);
    305304static EncodedJSValue JSC_HOST_CALL functionHeapSize(ExecState*);
    306305static EncodedJSValue JSC_HOST_CALL functionCreateMemoryFootprint(ExecState*);
    … …  
    521520        addFunction(vm, "fullGC", functionFullGC, 0);
    522521        addFunction(vm, "edenGC", functionEdenGC, 0);
    523         addFunction(vm, "forceGCSlowPaths", functionForceGCSlowPaths, 0);
    524522        addFunction(vm, "gcHeapSize", functionHeapSize, 0);
    525523        addFunction(vm, "MemoryFootprint", functionCreateMemoryFootprint, 0);
    … …  
    13711369}
    13721370
    1373 EncodedJSValue JSC_HOST_CALL functionForceGCSlowPaths(ExecState*)
    1374 {
    1375     // It's best for this to be the first thing called in the
    1376     // JS program so the option is set to true before we JIT.
    1377     Options::forceGCSlowPaths() = true;
    1378     return JSValue::encode(jsUndefined());
    1379 }
    1380 
    13811371EncodedJSValue JSC_HOST_CALL functionHeapSize(ExecState* exec)
    13821372{
    … …  
    21242114    VM& vm = exec->vm();
    21252115    JSObject* optionsObject = constructEmptyObject(exec);
    2126 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     2116#define READ_OPTION(type_, name_, defaultValue_, availability_, description_) \
    21272117    addOption(vm, optionsObject, Identifier::fromString(vm, #name_), Options::name_());
    2128     JSC_OPTIONS(FOR_EACH_OPTION)
    2129 #undef FOR_EACH_OPTION
     2118    FOR_EACH_JSC_OPTION(READ_OPTION)
     2119#undef READ_OPTION
    21302120    return JSValue::encode(optionsObject);
    21312121}
    … …  
    30993089{
    31003090    // Need to override and enable restricted options before we start parsing options below.
    3101     Options::enableRestrictedOptions(true);
     3091    Config::enableRestrictedOptions();
    31023092
    31033093    WTF::initializeMainThread();

  • TabularUnified trunk/Source/JavaScriptCore/runtime/ConfigFile.cpp

    r248552 r249808  
    466466
    467467        if (!jscOptionsBuilder.isEmpty()) {
    468             Options::enableRestrictedOptions(true);
     468            JSC::Config::enableRestrictedOptions();
    469469            Options::setOptions(jscOptionsBuilder.toString().utf8().data());
    470470        }

  • TabularUnified trunk/Source/JavaScriptCore/runtime/InitializeThreading.cpp

    r248187 r249808  
    3434#include "Heap.h"
    3535#include "Identifier.h"
     36#include "JSCConfig.h"
    3637#include "JSCPtrTag.h"
    3738#include "JSDateMath.h"
    … …  
    6364
    6465    std::call_once(initializeThreadingOnceFlag, []{
     66        RELEASE_ASSERT(!g_jscConfig.initializeThreadingHasBeenCalled);
     67        g_jscConfig.initializeThreadingHasBeenCalled = true;
     68
    6569        WTF::initializeThreading();
    6670        Options::initialize();

  • TabularUnified trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

    r249509 r249808  
    18231823void JSGlobalObject::exposeDollarVM(VM& vm)
    18241824{
     1825    RELEASE_ASSERT(g_jscConfig.restrictedOptionsEnabled && Options::useDollarVM());
    18251826    if (hasOwnProperty(globalExec(), vm.propertyNames->builtinNames().dollarVMPrivateName()))
    18261827        return;

  • TabularUnified trunk/Source/JavaScriptCore/runtime/Options.cpp

    r249075 r249808  
    5757namespace JSC {
    5858
    59 namespace {
    60 #ifdef NDEBUG
    61 bool restrictedOptionsEnabled = false;
    62 #else
    63 bool restrictedOptionsEnabled = true;
    64 #endif
    65 }
    66 
    67 void Options::enableRestrictedOptions(bool enableOrNot)
    68 {
    69     restrictedOptionsEnabled = enableOrNot;
    70 }
    71    
    7259static bool parse(const char* string, bool& value)
    7360{
    … …  
    149136{
    150137    if (availability == Availability::Restricted)
    151         return restrictedOptionsEnabled;
     138        return g_jscConfig.restrictedOptionsEnabled;
    152139    ASSERT(availability == Availability::Configurable);
    153140   
    … …  
    296283}
    297284
    298 Options::Entry Options::s_options[Options::numberOfOptions];
    299 Options::Entry Options::s_defaultOptions[Options::numberOfOptions];
    300 
    301285// Realize the names for each of the options:
    302286const Options::EntryInfo Options::s_optionsInfo[Options::numberOfOptions] = {
    303 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
    304     { #name_, description_, Options::Type::type_##Type, Availability::availability_ },
    305     JSC_OPTIONS(FOR_EACH_OPTION)
    306 #undef FOR_EACH_OPTION
     287#define FILL_OPTION_INFO(type_, name_, defaultValue_, availability_, description_) \
     288    { #name_, description_, Options::Type::type_, Availability::availability_ },
     289    FOR_EACH_JSC_OPTION(FILL_OPTION_INFO)
     290#undef FILL_OPTION_INFO
    307291};
    308292
    … …  
    333317    for (int i = 0; i < numberOfOptionsToScale; i++) {
    334318        Option option(optionsToScale[i].id);
    335         ASSERT(option.type() == Options::Type::int32Type);
     319        ASSERT(option.type() == Options::Type::Int32);
    336320        option.int32Val() *= scaleFactor;
    337321        option.int32Val() = std::max(option.int32Val(), optionsToScale[i].minVal);
    … …  
    530514        initializeOptionsOnceFlag,
    531515        [] {
     516#ifndef NDEBUG
     517            Config::enableRestrictedOptions();
     518#endif
    532519            // Initialize each of the options with their default values:
    533 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
    534             name_() = defaultValue_;                                    \
     520#define INIT_OPTION(type_, name_, defaultValue_, availability_, description_) \
     521            name_() = defaultValue_; \
    535522            name_##Default() = defaultValue_;
    536             JSC_OPTIONS(FOR_EACH_OPTION)
    537 #undef FOR_EACH_OPTION
     523            FOR_EACH_JSC_OPTION(INIT_OPTION)
     524#undef INIT_OPTION
    538525
    539526            overrideDefaults();
    … …  
    556543                CRASH();
    557544#else // PLATFORM(COCOA)
    558 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     545#define OVERRIDE_OPTION_WITH_HEURISTICS(type_, name_, defaultValue_, availability_, description_) \
    559546            overrideOptionWithHeuristic(name_(), name_##ID, "JSC_" #name_, Availability::availability_);
    560             JSC_OPTIONS(FOR_EACH_OPTION)
    561 #undef FOR_EACH_OPTION
     547            FOR_EACH_JSC_OPTION(OVERRIDE_OPTION_WITH_HEURISTICS)
     548#undef OVERRIDE_OPTION_WITH_HEURISTICS
    562549#endif // PLATFORM(COCOA)
    563550
    564 #define FOR_EACH_OPTION(aliasedName_, unaliasedName_, equivalence_) \
     551#define OVERRIDE_ALIASED_OPTION_WITH_HEURISTICS(aliasedName_, unaliasedName_, equivalence_) \
    565552            overrideAliasedOptionWithHeuristic("JSC_" #aliasedName_);
    566             JSC_ALIASED_OPTIONS(FOR_EACH_OPTION)
    567 #undef FOR_EACH_OPTION
     553            FOR_EACH_JSC_ALIASED_OPTION(OVERRIDE_ALIASED_OPTION_WITH_HEURISTICS)
     554#undef OVERRIDE_ALIASED_OPTION_WITH_HEURISTICS
    568555
    569556#if 0
    … …  
    643630bool Options::setOptions(const char* optionsStr)
    644631{
     632    RELEASE_ASSERT(!g_jscConfig.isPermanentlyFrozen);
    645633    Vector<char*> options;
    646634
    … …  
    737725    // For each option, check if the specify arg is a match. If so, set the arg
    738726    // if the value makes sense. Otherwise, move on to checking the next option.
    739 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
     727#define SET_OPTION_IF_MATCH(type_, name_, defaultValue_, availability_, description_) \
    740728    if (strlen(#name_) == static_cast<size_t>(equalStr - arg)      \
    741729        && !strncmp(arg, #name_, equalStr - arg)) {                \
    … …  
    743731            && !isAvailable(name_##ID, Availability::availability_)) \
    744732            return false;                                          \
    745         type_ value;                                               \
     733        OptionEntry::type_ value;                                  \
    746734        value = (defaultValue_);                                   \
    747735        bool success = parse(valueStr, value);                     \
    … …  
    755743    }
    756744
    757     JSC_OPTIONS(FOR_EACH_OPTION)
    758 #undef FOR_EACH_OPTION
     745    FOR_EACH_JSC_OPTION(SET_OPTION_IF_MATCH)
     746#undef SET_OPTION_IF_MATCH
    759747
    760748    return false; // No option matched.
    … …  
    799787    }
    800788
    801     JSC_ALIASED_OPTIONS(FOR_EACH_OPTION)
     789    FOR_EACH_JSC_ALIASED_OPTION(FOR_EACH_OPTION)
    802790#undef FOR_EACH_OPTION
    803791
    … …  
    891879{
    892880    switch (type()) {
    893     case Options::Type::boolType:
    894         builder.append(m_entry.boolVal ? "true" : "false");
     881    case Options::Type::Bool:
     882        builder.append(m_entry.valBool ? "true" : "false");
    895883        break;
    896     case Options::Type::unsignedType:
    897         builder.appendNumber(m_entry.unsignedVal);
     884    case Options::Type::Unsigned:
     885        builder.appendNumber(m_entry.valUnsigned);
    898886        break;
    899     case Options::Type::sizeType:
    900         builder.appendNumber(m_entry.sizeVal);
     887    case Options::Type::Size:
     888        builder.appendNumber(m_entry.valSize);
    901889        break;
    902     case Options::Type::doubleType:
    903         builder.appendFixedPrecisionNumber(m_entry.doubleVal);
     890    case Options::Type::Double:
     891        builder.appendFixedPrecisionNumber(m_entry.valDouble);
    904892        break;
    905     case Options::Type::int32Type:
    906         builder.appendNumber(m_entry.int32Val);
     893    case Options::Type::Int32:
     894        builder.appendNumber(m_entry.valInt32);
    907895        break;
    908     case Options::Type::optionRangeType:
    909         builder.append(m_entry.optionRangeVal.rangeString());
     896    case Options::Type::OptionRange:
     897        builder.append(m_entry.valOptionRange.rangeString());
    910898        break;
    911     case Options::Type::optionStringType: {
    912         const char* option = m_entry.optionStringVal;
     899    case Options::Type::OptionString: {
     900        const char* option = m_entry.valOptionString;
    913901        if (!option)
    914902            option = "";
    … …  
    918906        break;
    919907    }
    920     case Options::Type::gcLogLevelType: {
    921         builder.append(GCLogging::levelAsString(m_entry.gcLogLevelVal));
     908    case Options::Type::GCLogLevel: {
     909        builder.append(GCLogging::levelAsString(m_entry.valGCLogLevel));
    922910        break;
    923911    }
    … …  
    928916{
    929917    switch (type()) {
    930     case Options::Type::boolType:
    931         return m_entry.boolVal == other.m_entry.boolVal;
    932     case Options::Type::unsignedType:
    933         return m_entry.unsignedVal == other.m_entry.unsignedVal;
    934     case Options::Type::sizeType:
    935         return m_entry.sizeVal == other.m_entry.sizeVal;
    936     case Options::Type::doubleType:
    937         return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
    938     case Options::Type::int32Type:
    939         return m_entry.int32Val == other.m_entry.int32Val;
    940     case Options::Type::optionRangeType:
    941         return m_entry.optionRangeVal.rangeString() == other.m_entry.optionRangeVal.rangeString();
    942     case Options::Type::optionStringType:
    943         return (m_entry.optionStringVal == other.m_entry.optionStringVal)
    944             || (m_entry.optionStringVal && other.m_entry.optionStringVal && !strcmp(m_entry.optionStringVal, other.m_entry.optionStringVal));
    945     case Options::Type::gcLogLevelType:
    946         return m_entry.gcLogLevelVal == other.m_entry.gcLogLevelVal;
     918    case Options::Type::Bool:
     919        return m_entry.valBool == other.m_entry.valBool;
     920    case Options::Type::Unsigned:
     921        return m_entry.valUnsigned == other.m_entry.valUnsigned;
     922    case Options::Type::Size:
     923        return m_entry.valSize == other.m_entry.valSize;
     924    case Options::Type::Double:
     925        return (m_entry.valDouble == other.m_entry.valDouble) || (std::isnan(m_entry.valDouble) && std::isnan(other.m_entry.valDouble));
     926    case Options::Type::Int32:
     927        return m_entry.valInt32 == other.m_entry.valInt32;
     928    case Options::Type::OptionRange:
     929        return m_entry.valOptionRange.rangeString() == other.m_entry.valOptionRange.rangeString();
     930    case Options::Type::OptionString:
     931        return (m_entry.valOptionString == other.m_entry.valOptionString)
     932            || (m_entry.valOptionString && other.m_entry.valOptionString && !strcmp(m_entry.valOptionString, other.m_entry.valOptionString));
     933    case Options::Type::GCLogLevel:
     934        return m_entry.valGCLogLevel == other.m_entry.valGCLogLevel;
    947935    }
    948936    return false;
    … …  
    950938
    951939} // namespace JSC
    952 

  • TabularUnified trunk/Source/JavaScriptCore/runtime/Options.h

    r249075 r249808  
    2626#pragma once
    2727
    28 #include "GCLogging.h"
     28#include "JSCConfig.h"
    2929#include "JSExportMacros.h"
    3030#include <stdint.h>
    … …  
    4242// How do JSC VM options work?
    4343// ===========================
    44 // The JSC_OPTIONS() macro below defines a list of all JSC options in use,
     44// The FOR_EACH_JSC_OPTION() macro below defines a list of all JSC options in use,
    4545// along with their types and default values. The options values are actually
    46 // realized as an array of Options::Entry elements.
     46// realized as an array of OptionEntry elements in JSC::Config.
    4747//
    4848//     Options::initialize() will initialize the array of options values with
    49 // the defaults specified in JSC_OPTIONS() below. After that, the values can
     49// the defaults specified in FOR_EACH_JSC_OPTION() below. After that, the values can
    5050// be programmatically read and written to using an accessor method with the
    5151// same name as the option. For example, the option "useJIT" can be read and
    … …  
    6868// ensure that the new values set are sane and reasonable for your own run.
    6969
    70 class OptionRange {
    71 private:
    72     enum RangeState { Uninitialized, InitError, Normal, Inverted };
    73 public:
    74     OptionRange& operator= (const int& rhs)
    75     { // Only needed for initialization
    76         if (!rhs) {
    77             m_state = Uninitialized;
    78             m_rangeString = 0;
    79             m_lowLimit = 0;
    80             m_highLimit = 0;
    81         }
    82         return *this;
    83     }
    84 
    85     bool init(const char*);
    86     bool isInRange(unsigned);
    87     const char* rangeString() const { return (m_state > InitError) ? m_rangeString : s_nullRangeStr; }
    88    
    89     void dump(PrintStream& out) const;
    90 
    91 private:
    92     static const char* const s_nullRangeStr;
    93 
    94     RangeState m_state;
    95     const char* m_rangeString;
    96     unsigned m_lowLimit;
    97     unsigned m_highLimit;
    98 };
    99 
    100 typedef OptionRange optionRange;
    101 typedef const char* optionString;
    102 
    10370#if PLATFORM(IOS_FAMILY)
    10471#define MAXIMUM_NUMBER_OF_FTL_COMPILER_THREADS 2
    … …  
    11279constexpr bool enableWebAssemblyStreamingApi = false;
    11380#endif
    114 
    115 #define JSC_OPTIONS(v) \
    116     v(bool, useKernTCSM, true, Normal, "Note: this needs to go before other options since they depend on this value.") \
    117     v(bool, validateOptions, false, Normal, "crashes if mis-typed JSC options were passed to the VM") \
    118     v(unsigned, dumpOptions, 0, Normal, "dumps JSC options (0 = None, 1 = Overridden only, 2 = All, 3 = Verbose)") \
    119     v(optionString, configFile, nullptr, Normal, "file to configure JSC options and logging location") \
    120     \
    121     v(bool, useLLInt,  true, Normal, "allows the LLINT to be used if true") \
    122     v(bool, useJIT, jitEnabledByDefault(), Normal, "allows the executable pages to be allocated for JIT and thunks if true") \
    123     v(bool, useBaselineJIT, true, Normal, "allows the baseline JIT to be used if true") \
    124     v(bool, useDFGJIT, true, Normal, "allows the DFG JIT to be used if true") \
    125     v(bool, useRegExpJIT, jitEnabledByDefault(), Normal, "allows the RegExp JIT to be used if true") \
    126     v(bool, useDOMJIT, is64Bit(), Normal, "allows the DOMJIT to be used if true") \
    127     \
    128     v(bool, reportMustSucceedExecutableAllocations, false, Normal, nullptr) \
    129     \
    130     v(unsigned, maxPerThreadStackUsage, 4 * MB, Normal, "Max allowed stack usage by the VM") \
    131     v(unsigned, softReservedZoneSize, 128 * KB, Normal, "A buffer greater than reservedZoneSize that reserves space for stringifying exceptions.") \
    132     v(unsigned, reservedZoneSize, 64 * KB, Normal, "The amount of stack space we guarantee to our clients (and to interal VM code that does not call out to clients).") \
    133     \
    134     v(bool, crashIfCantAllocateJITMemory, false, Normal, nullptr) \
    135     v(unsigned, jitMemoryReservationSize, 0, Normal, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
    136     v(bool, useSeparatedWXHeap, false, Normal, nullptr) \
    137     \
    138     v(bool, forceCodeBlockLiveness, false, Normal, nullptr) \
    139     v(bool, forceICFailure, false, Normal, nullptr) \
    140     \
    141     v(unsigned, repatchCountForCoolDown, 8, Normal, nullptr) \
    142     v(unsigned, initialCoolDownCount, 20, Normal, nullptr) \
    143     v(unsigned, repatchBufferingCountdown, 8, Normal, nullptr) \
    144     \
    145     v(bool, dumpGeneratedBytecodes, false, Normal, nullptr) \
    146     v(bool, dumpBytecodeLivenessResults, false, Normal, nullptr) \
    147     v(bool, validateBytecode, false, Normal, nullptr) \
    148     v(bool, forceDebuggerBytecodeGeneration, false, Normal, nullptr) \
    149     v(bool, dumpBytecodesBeforeGeneratorification, false, Normal, nullptr) \
    150     \
    151     v(bool, useFunctionDotArguments, true, Normal, nullptr) \
    152     v(bool, useTailCalls, true, Normal, nullptr) \
    153     v(bool, optimizeRecursiveTailCalls, true, Normal, nullptr) \
    154     v(bool, alwaysUseShadowChicken, false, Normal, nullptr) \
    155     v(unsigned, shadowChickenLogSize, 1000, Normal, nullptr) \
    156     v(unsigned, shadowChickenMaxTailDeletedFramesSize, 128, Normal, nullptr) \
    157     \
    158     /* dumpDisassembly implies dumpDFGDisassembly. */ \
    159     v(bool, dumpDisassembly, false, Normal, "dumps disassembly of all JIT compiled code upon compilation") \
    160     v(bool, asyncDisassembly, false, Normal, nullptr) \
    161     v(bool, dumpDFGDisassembly, false, Normal, "dumps disassembly of DFG function upon compilation") \
    162     v(bool, dumpFTLDisassembly, false, Normal, "dumps disassembly of FTL function upon compilation") \
    163     v(bool, dumpRegExpDisassembly, false, Normal, "dumps disassembly of RegExp upon compilation") \
    164     v(bool, dumpAllDFGNodes, false, Normal, nullptr) \
    165     v(bool, logJITCodeForPerf, false, Configurable, nullptr) \
    166     v(optionRange, bytecodeRangeToJITCompile, 0, Normal, "bytecode size range to allow compilation on, e.g. 1:100") \
    167     v(optionRange, bytecodeRangeToDFGCompile, 0, Normal, "bytecode size range to allow DFG compilation on, e.g. 1:100") \
    168     v(optionRange, bytecodeRangeToFTLCompile, 0, Normal, "bytecode size range to allow FTL compilation on, e.g. 1:100") \
    169     v(optionString, jitWhitelist, nullptr, Normal, "file with list of function signatures to allow compilation on") \
    170     v(optionString, dfgWhitelist, nullptr, Normal, "file with list of function signatures to allow DFG compilation on") \
    171     v(optionString, ftlWhitelist, nullptr, Normal, "file with list of function signatures to allow FTL compilation on") \
    172     v(bool, dumpSourceAtDFGTime, false, Normal, "dumps source code of JS function being DFG compiled") \
    173     v(bool, dumpBytecodeAtDFGTime, false, Normal, "dumps bytecode of JS function being DFG compiled") \
    174     v(bool, dumpGraphAfterParsing, false, Normal, nullptr) \
    175     v(bool, dumpGraphAtEachPhase, false, Normal, nullptr) \
    176     v(bool, dumpDFGGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation (note this excludes DFG graphs during FTL compilation)") \
    177     v(bool, dumpDFGFTLGraphAtEachPhase, false, Normal, "dumps the DFG graph at each phase of DFG compilation when compiling FTL code") \
    178     v(bool, dumpB3GraphAtEachPhase, false, Normal, "dumps the B3 graph at each phase of compilation") \
    179     v(bool, dumpAirGraphAtEachPhase, false, Normal, "dumps the Air graph at each phase of compilation") \
    180     v(bool, verboseDFGBytecodeParsing, false, Normal, nullptr) \
    181     v(bool, safepointBeforeEachPhase, true, Normal, nullptr) \
    182     v(bool, verboseCompilation, false, Normal, nullptr) \
    183     v(bool, verboseFTLCompilation, false, Normal, nullptr) \
    184     v(bool, logCompilationChanges, false, Normal, nullptr) \
    185     v(bool, useProbeOSRExit, false, Normal, nullptr) \
    186     v(bool, printEachOSRExit, false, Normal, nullptr) \
    187     v(bool, validateGraph, false, Normal, nullptr) \
    188     v(bool, validateGraphAtEachPhase, false, Normal, nullptr) \
    189     v(bool, verboseValidationFailure, false, Normal, nullptr) \
    190     v(bool, verboseOSR, false, Normal, nullptr) \
    191     v(bool, verboseDFGOSRExit, false, Normal, nullptr) \
    192     v(bool, verboseFTLOSRExit, false, Normal, nullptr) \
    193     v(bool, verboseCallLink, false, Normal, nullptr) \
    194     v(bool, verboseCompilationQueue, false, Normal, nullptr) \
    195     v(bool, reportCompileTimes, false, Normal, "dumps JS function signature and the time it took to compile in all tiers") \
    196     v(bool, reportBaselineCompileTimes, false, Normal, "dumps JS function signature and the time it took to BaselineJIT compile") \
    197     v(bool, reportDFGCompileTimes, false, Normal, "dumps JS function signature and the time it took to DFG and FTL compile") \
    198     v(bool, reportFTLCompileTimes, false, Normal, "dumps JS function signature and the time it took to FTL compile") \
    199     v(bool, reportTotalCompileTimes, false, Normal, nullptr) \
    200     v(bool, reportParseTimes, false, Normal, "dumps JS function signature and the time it took to parse") \
    201     v(bool, reportBytecodeCompileTimes, false, Normal, "dumps JS function signature and the time it took to bytecode compile") \
    202     v(bool, countParseTimes, false, Normal, "counts parse times") \
    203     v(bool, verboseExitProfile, false, Normal, nullptr) \
    204     v(bool, verboseCFA, false, Normal, nullptr) \
    205     v(bool, verboseDFGFailure, false, Normal, nullptr) \
    206     v(bool, verboseFTLToJSThunk, false, Normal, nullptr) \
    207     v(bool, verboseFTLFailure, false, Normal, nullptr) \
    208     v(bool, alwaysComputeHash, false, Normal, nullptr) \
    209     v(bool, testTheFTL, false, Normal, nullptr) \
    210     v(bool, verboseSanitizeStack, false, Normal, nullptr) \
    211     v(bool, useGenerationalGC, true, Normal, nullptr) \
    212     v(bool, useConcurrentGC, true, Normal, nullptr) \
    213     v(bool, collectContinuously, false, Normal, nullptr) \
    214     v(double, collectContinuouslyPeriodMS, 1, Normal, nullptr) \
    215     v(bool, forceFencedBarrier, false, Normal, nullptr) \
    216     v(bool, verboseVisitRace, false, Normal, nullptr) \
    217     v(bool, optimizeParallelSlotVisitorsForStoppedMutator, false, Normal, nullptr) \
    218     v(unsigned, largeHeapSize, 32 * 1024 * 1024, Normal, nullptr) \
    219     v(unsigned, smallHeapSize, 1 * 1024 * 1024, Normal, nullptr) \
    220     v(double, smallHeapRAMFraction, 0.25, Normal, nullptr) \
    221     v(double, smallHeapGrowthFactor, 2, Normal, nullptr) \
    222     v(double, mediumHeapRAMFraction, 0.5, Normal, nullptr) \
    223     v(double, mediumHeapGrowthFactor, 1.5, Normal, nullptr) \
    224     v(double, largeHeapGrowthFactor, 1.24, Normal, nullptr) \
    225     v(double, miniVMHeapGrowthFactor, 1.27, Normal, nullptr) \
    226     v(double, criticalGCMemoryThreshold, 0.80, Normal, "percent memory in use the GC considers critical.  The collector is much more aggressive above this threshold") \
    227     v(double, minimumMutatorUtilization, 0, Normal, nullptr) \
    228     v(double, maximumMutatorUtilization, 0.7, Normal, nullptr) \
    229     v(double, epsilonMutatorUtilization, 0.01, Normal, nullptr) \
    230     v(double, concurrentGCMaxHeadroom, 1.5, Normal, nullptr) \
    231     v(double, concurrentGCPeriodMS, 2, Normal, nullptr) \
    232     v(bool, useStochasticMutatorScheduler, true, Normal, nullptr) \
    233     v(double, minimumGCPauseMS, 0.3, Normal, nullptr) \
    234     v(double, gcPauseScale, 0.3, Normal, nullptr) \
    235     v(double, gcIncrementBytes, 10000, Normal, nullptr) \
    236     v(double, gcIncrementMaxBytes, 100000, Normal, nullptr) \
    237     v(double, gcIncrementScale, 0, Normal, nullptr) \
    238     v(bool, scribbleFreeCells, false, Normal, nullptr) \
    239     v(double, sizeClassProgression, 1.4, Normal, nullptr) \
    240     v(unsigned, largeAllocationCutoff, 100000, Normal, nullptr) \
    241     v(bool, dumpSizeClasses, false, Normal, nullptr) \
    242     v(bool, useBumpAllocator, true, Normal, nullptr) \
    243     v(bool, stealEmptyBlocksFromOtherAllocators, true, Normal, nullptr) \
    244     v(bool, eagerlyUpdateTopCallFrame, false, Normal, nullptr) \
    245     v(bool, dumpZappedCellCrashData, false, Normal, nullptr) \
    246     \
    247     v(bool, useOSREntryToDFG, true, Normal, nullptr) \
    248     v(bool, useOSREntryToFTL, true, Normal, nullptr) \
    249     \
    250     v(bool, useFTLJIT, true, Normal, "allows the FTL JIT to be used if true") \
    251     v(bool, useFTLTBAA, true, Normal, nullptr) \
    252     v(bool, validateFTLOSRExitLiveness, false, Normal, nullptr) \
    253     v(unsigned, defaultB3OptLevel, 2, Normal, nullptr) \
    254     v(bool, b3AlwaysFailsBeforeCompile, false, Normal, nullptr) \
    255     v(bool, b3AlwaysFailsBeforeLink, false, Normal, nullptr) \
    256     v(bool, ftlCrashes, false, Normal, nullptr) /* fool-proof way of checking that you ended up in the FTL. ;-) */\
    257     v(bool, clobberAllRegsInFTLICSlowPath, !ASSERT_DISABLED, Normal, nullptr) \
    258     v(bool, enableJITDebugAssertions, !ASSERT_DISABLED, Normal, nullptr) \
    259     v(bool, useAccessInlining, true, Normal, nullptr) \
    260     v(unsigned, maxAccessVariantListSize, 8, Normal, nullptr) \
    261     v(bool, usePolyvariantDevirtualization, true, Normal, nullptr) \
    262     v(bool, usePolymorphicAccessInlining, true, Normal, nullptr) \
    263     v(unsigned, maxPolymorphicAccessInliningListSize, 8, Normal, nullptr) \
    264     v(bool, usePolymorphicCallInlining, true, Normal, nullptr) \
    265     v(bool, usePolymorphicCallInliningForNonStubStatus, false, Normal, nullptr) \
    266     v(unsigned, maxPolymorphicCallVariantListSize, 15, Normal, nullptr) \
    267     v(unsigned, maxPolymorphicCallVariantListSizeForTopTier, 5, Normal, nullptr) \
    268     v(unsigned, maxPolymorphicCallVariantListSizeForWebAssemblyToJS, 5, Normal, nullptr) \
    269     v(unsigned, maxPolymorphicCallVariantsForInlining, 5, Normal, nullptr) \
    270     v(unsigned, frequentCallThreshold, 2, Normal, nullptr) \
    271     v(double, minimumCallToKnownRate, 0.51, Normal, nullptr) \
    272     v(bool, createPreHeaders, true, Normal, nullptr) \
    273     v(bool, useMovHintRemoval, true, Normal, nullptr) \
    274     v(bool, usePutStackSinking, true, Normal, nullptr) \
    275     v(bool, useObjectAllocationSinking, true, Normal, nullptr) \
    276     v(bool, useValueRepElimination, true, Normal, nullptr) \
    277     v(bool, useArityFixupInlining, true, Normal, nullptr) \
    278     v(bool, logExecutableAllocation, false, Normal, nullptr) \
    279     v(unsigned, maxDFGNodesInBasicBlockForPreciseAnalysis, 20000, Normal, "Disable precise but costly analysis and give conservative results if the number of DFG nodes in a block exceeds this threshold") \
    280     \
    281     v(bool, useConcurrentJIT, true, Normal, "allows the DFG / FTL compilation in threads other than the executing JS thread") \
    282     v(unsigned, numberOfDFGCompilerThreads, computeNumberOfWorkerThreads(3, 2) - 1, Normal, nullptr) \
    283     v(unsigned, numberOfFTLCompilerThreads, computeNumberOfWorkerThreads(MAXIMUM_NUMBER_OF_FTL_COMPILER_THREADS, 2) - 1, Normal, nullptr) \
    284     v(int32, priorityDeltaOfDFGCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
    285     v(int32, priorityDeltaOfFTLCompilerThreads, computePriorityDeltaOfWorkerThreads(-2, 0), Normal, nullptr) \
    286     v(int32, priorityDeltaOfWasmCompilerThreads, computePriorityDeltaOfWorkerThreads(-1, 0), Normal, nullptr) \
    287     \
    288     v(bool, useProfiler, false, Normal, nullptr) \
    289     v(bool, disassembleBaselineForProfiler, true, Normal, nullptr) \
    290     \
    291     v(bool, useArchitectureSpecificOptimizations, true, Normal, nullptr) \
    292     \
    293     v(bool, breakOnThrow, false, Normal, nullptr) \
    294     \
    295     v(unsigned, maximumOptimizationCandidateBytecodeCost, 100000, Normal, nullptr) \
    296     \
    297     v(unsigned, maximumFunctionForCallInlineCandidateBytecodeCost, 120, Normal, nullptr) \
    298     v(unsigned, maximumFunctionForClosureCallInlineCandidateBytecodeCost, 100, Normal, nullptr) \
    299     v(unsigned, maximumFunctionForConstructInlineCandidateBytecoodeCost, 100, Normal, nullptr) \
    300     \
    301     v(unsigned, maximumFTLCandidateBytecodeCost, 20000, Normal, nullptr) \
    302     \
    303     /* Depth of inline stack, so 1 = no inlining, 2 = one level, etc. */ \
    304     v(unsigned, maximumInliningDepth, 5, Normal, "maximum allowed inlining depth.  Depth of 1 means no inlining") \
    305     v(unsigned, maximumInliningRecursion, 2, Normal, nullptr) \
    306     \
    307     /* Maximum size of a caller for enabling inlining. This is purely to protect us */\
    308     /* from super long compiles that take a lot of memory. */\
    309     v(unsigned, maximumInliningCallerBytecodeCost, 10000, Normal, nullptr) \
    310     \
    311     v(unsigned, maximumVarargsForInlining, 100, Normal, nullptr) \
    312     \
    313     v(unsigned, maximumBinaryStringSwitchCaseLength, 50, Normal, nullptr) \
    314     v(unsigned, maximumBinaryStringSwitchTotalLength, 2000, Normal, nullptr) \
    315     \
    316     v(double, jitPolicyScale, 1.0, Normal, "scale JIT thresholds to this specified ratio between 0.0 (compile ASAP) and 1.0 (compile like normal).") \
    317     v(bool, forceEagerCompilation, false, Normal, nullptr) \
    318     v(int32, thresholdForJITAfterWarmUp, 500, Normal, nullptr) \
    319     v(int32, thresholdForJITSoon, 100, Normal, nullptr) \
    320     \
    321     v(int32, thresholdForOptimizeAfterWarmUp, 1000, Normal, nullptr) \
    322     v(int32, thresholdForOptimizeAfterLongWarmUp, 1000, Normal, nullptr) \
    323     v(int32, thresholdForOptimizeSoon, 1000, Normal, nullptr) \
    324     v(int32, executionCounterIncrementForLoop, 1, Normal, nullptr) \
    325     v(int32, executionCounterIncrementForEntry, 15, Normal, nullptr) \
    326     \
    327     v(int32, thresholdForFTLOptimizeAfterWarmUp, 100000, Normal, nullptr) \
    328     v(int32, thresholdForFTLOptimizeSoon, 1000, Normal, nullptr) \
    329     v(int32, ftlTierUpCounterIncrementForLoop, 1, Normal, nullptr) \
    330     v(int32, ftlTierUpCounterIncrementForReturn, 15, Normal, nullptr) \
    331     v(unsigned, ftlOSREntryFailureCountForReoptimization, 15, Normal, nullptr) \
    332     v(unsigned, ftlOSREntryRetryThreshold, 100, Normal, nullptr) \
    333     \
    334     v(int32, evalThresholdMultiplier, 10, Normal, nullptr) \
    335     v(unsigned, maximumEvalCacheableSourceLength, 256, Normal, nullptr) \
    336     \
    337     v(bool, randomizeExecutionCountsBetweenCheckpoints, false, Normal, nullptr) \
    338     v(int32, maximumExecutionCountsBetweenCheckpointsForBaseline, 1000, Normal, nullptr) \
    339     v(int32, maximumExecutionCountsBetweenCheckpointsForUpperTiers, 50000, Normal, nullptr) \
    340     \
    341     v(unsigned, likelyToTakeSlowCaseMinimumCount, 20, Normal, nullptr) \
    342     v(unsigned, couldTakeSlowCaseMinimumCount, 10, Normal, nullptr) \
    343     \
    344     v(unsigned, osrExitCountForReoptimization, 100, Normal, nullptr) \
    345     v(unsigned, osrExitCountForReoptimizationFromLoop, 5, Normal, nullptr) \
    346     \
    347     v(unsigned, reoptimizationRetryCounterMax, 0, Normal, nullptr)  \
    348     \
    349     v(unsigned, minimumOptimizationDelay, 1, Normal, nullptr) \
    350     v(unsigned, maximumOptimizationDelay, 5, Normal, nullptr) \
    351     v(double, desiredProfileLivenessRate, 0.75, Normal, nullptr) \
    352     v(double, desiredProfileFullnessRate, 0.35, Normal, nullptr) \
    353     \
    354     v(double, doubleVoteRatioForDoubleFormat, 2, Normal, nullptr) \
    355     v(double, structureCheckVoteRatioForHoisting, 1, Normal, nullptr) \
    356     v(double, checkArrayVoteRatioForHoisting, 1, Normal, nullptr) \
    357     \
    358     v(unsigned, maximumDirectCallStackSize, 200, Normal, nullptr) \
    359     \
    360     v(unsigned, minimumNumberOfScansBetweenRebalance, 100, Normal, nullptr) \
    361     v(unsigned, numberOfGCMarkers, computeNumberOfGCMarkers(8), Normal, nullptr) \
    362     v(bool, useParallelMarkingConstraintSolver, true, Normal, nullptr) \
    363     v(unsigned, opaqueRootMergeThreshold, 1000, Normal, nullptr) \
    364     v(double, minHeapUtilization, 0.8, Normal, nullptr) \
    365     v(double, minMarkedBlockUtilization, 0.9, Normal, nullptr) \
    366     v(unsigned, slowPathAllocsBetweenGCs, 0, Normal, "force a GC on every Nth slow path alloc, where N is specified by this option") \
    367     \
    368     v(double, percentCPUPerMBForFullTimer, 0.0003125, Normal, nullptr) \
    369     v(double, percentCPUPerMBForEdenTimer, 0.0025, Normal, nullptr) \
    370     v(double, collectionTimerMaxPercentCPU, 0.05, Normal, nullptr) \
    371     \
    372     v(bool, forceWeakRandomSeed, false, Normal, nullptr) \
    373     v(unsigned, forcedWeakRandomSeed, 0, Normal, nullptr) \
    374     \
    375     v(bool, useZombieMode, false, Normal, "debugging option to scribble over dead objects with 0xbadbeef0") \
    376     v(bool, useImmortalObjects, false, Normal, "debugging option to keep all objects alive forever") \
    377     v(bool, sweepSynchronously, false, Normal, "debugging option to sweep all dead objects synchronously at GC end before resuming mutator") \
    378     v(unsigned, maxSingleAllocationSize, 0, Configurable, "debugging option to limit individual allocations to a max size (0 = limit not set, N = limit size in bytes)") \
    379     \
    380     v(gcLogLevel, logGC, GCLogging::None, Normal, "debugging option to log GC activity (0 = None, 1 = Basic, 2 = Verbose)") \
    381     v(bool, useGC, true, Normal, nullptr) \
    382     v(bool, gcAtEnd, false, Normal, "If true, the jsc CLI will do a GC before exiting") \
    383     v(bool, forceGCSlowPaths, false, Normal, "If true, we will force all JIT fast allocations down their slow paths.") \
    384     v(unsigned, gcMaxHeapSize, 0, Normal, nullptr) \
    385     v(unsigned, forceRAMSize, 0, Normal, nullptr) \
    386     v(bool, recordGCPauseTimes, false, Normal, nullptr) \
    387     v(bool, dumpHeapStatisticsAtVMDestruction, false, Normal, nullptr) \
    388     v(bool, forceCodeBlockToJettisonDueToOldAge, false, Normal, "If true, this means that anytime we can jettison a CodeBlock due to old age, we do.") \
    389     v(bool, useEagerCodeBlockJettisonTiming, false, Normal, "If true, the time slices for jettisoning a CodeBlock due to old age are shrunk significantly.") \
    390     \
    391     v(bool, useTypeProfiler, false, Normal, nullptr) \
    392     v(bool, useControlFlowProfiler, false, Normal, nullptr) \
    393     \
    394     v(bool, useSamplingProfiler, false, Normal, nullptr) \
    395     v(unsigned, sampleInterval, 1000, Normal, "Time between stack traces in microseconds.") \
    396     v(bool, collectSamplingProfilerDataForJSCShell, false, Normal, "This corresponds to the JSC shell's --sample option.") \
    397     v(unsigned, samplingProfilerTopFunctionsCount, 12, Normal, "Number of top functions to report when using the command line interface.") \
    398     v(unsigned, samplingProfilerTopBytecodesCount, 40, Normal, "Number of top bytecodes to report when using the command line interface.") \
    399     v(optionString, samplingProfilerPath, nullptr, Normal, "The path to the directory to write sampiling profiler output to. This probably will not work with WK2 unless the path is in the whitelist.") \
    400     v(bool, sampleCCode, false, Normal, "Causes the sampling profiler to record profiling data for C frames.") \
    401     \
    402     v(bool, alwaysGeneratePCToCodeOriginMap, false, Normal, "This will make sure we always generate a PCToCodeOriginMap for JITed code.") \
    403     \
    404     v(bool, verifyHeap, false, Normal, nullptr) \
    405     v(unsigned, numberOfGCCyclesToRecordForVerification, 3, Normal, nullptr) \
    406     \
    407     v(unsigned, exceptionStackTraceLimit, 100, Normal, "Stack trace limit for internal Exception object") \
    408     v(unsigned, defaultErrorStackTraceLimit, 100, Normal, "The default value for Error.stackTraceLimit") \
    409     v(bool, useExceptionFuzz, false, Normal, nullptr) \
    410     v(unsigned, fireExceptionFuzzAt, 0, Normal, nullptr) \
    411     v(bool, validateDFGExceptionHandling, false, Normal, "Causes the DFG to emit code validating exception handling for each node that can exit") /* This is true by default on Debug builds */\
    412     v(bool, dumpSimulatedThrows, false, Normal, "Dumps the call stack of the last simulated throw if exception scope verification fails") \
    413     v(bool, validateExceptionChecks, false, Normal, "Verifies that needed exception checks are performed.") \
    414     v(unsigned, unexpectedExceptionStackTraceLimit, 100, Normal, "Stack trace limit for debugging unexpected exceptions observed in the VM") \
    415     \
    416     v(bool, useExecutableAllocationFuzz, false, Normal, nullptr) \
    417     v(unsigned, fireExecutableAllocationFuzzAt, 0, Normal, nullptr) \
    418     v(unsigned, fireExecutableAllocationFuzzAtOrAfter, 0, Normal, nullptr) \
    419     v(bool, verboseExecutableAllocationFuzz, false, Normal, nullptr) \
    420     \
    421     v(bool, useOSRExitFuzz, false, Normal, nullptr) \
    422     v(unsigned, fireOSRExitFuzzAtStatic, 0, Normal, nullptr) \
    423     v(unsigned, fireOSRExitFuzzAt, 0, Normal, nullptr) \
    424     v(unsigned, fireOSRExitFuzzAtOrAfter, 0, Normal, nullptr) \
    425     \
    426     v(bool, useRandomizingFuzzerAgent, false, Normal, nullptr) \
    427     v(unsigned, seedOfRandomizingFuzzerAgent, 1, Normal, nullptr) \
    428     v(bool, dumpRandomizingFuzzerAgentPredictions, false, Normal, nullptr) \
    429     v(bool, useDoublePredictionFuzzerAgent, false, Normal, nullptr) \
    430     \
    431     v(bool, logPhaseTimes, false, Normal, nullptr) \
    432     v(double, rareBlockPenalty, 0.001, Normal, nullptr) \
    433     v(bool, airLinearScanVerbose, false, Normal, nullptr) \
    434     v(bool, airLinearScanSpillsEverything, false, Normal, nullptr) \
    435     v(bool, airForceBriggsAllocator, false, Normal, nullptr) \
    436     v(bool, airForceIRCAllocator, false, Normal, nullptr) \
    437     v(bool, airRandomizeRegs, false, Normal, nullptr) \
    438     v(unsigned, airRandomizeRegsSeed, 0, Normal, nullptr) \
    439     v(bool, coalesceSpillSlots, true, Normal, nullptr) \
    440     v(bool, logAirRegisterPressure, false, Normal, nullptr) \
    441     v(bool, useB3TailDup, true, Normal, nullptr) \
    442     v(unsigned, maxB3TailDupBlockSize, 3, Normal, nullptr) \
    443     v(unsigned, maxB3TailDupBlockSuccessors, 3, Normal, nullptr) \
    444     \
    445     v(bool, useDollarVM, false, Restricted, "installs the $vm debugging tool in global objects") \
    446     v(optionString, functionOverrides, nullptr, Restricted, "file with debugging overrides for function bodies") \
    447     v(bool, useSigillCrashAnalyzer, false, Configurable, "logs data about SIGILL crashes") \
    448     \
    449     v(unsigned, watchdog, 0, Normal, "watchdog timeout (0 = Disabled, N = a timeout period of N milliseconds)") \
    450     v(bool, usePollingTraps, false, Normal, "use polling (instead of signalling) VM traps") \
    451     \
    452     v(bool, useMachForExceptions, true, Normal, "Use mach exceptions rather than signals to handle faults and pass thread messages. (This does nothing on platforms without mach)") \
    453     \
    454     v(bool, useICStats, false, Normal, nullptr) \
    455     \
    456     v(unsigned, prototypeHitCountForLLIntCaching, 2, Normal, "Number of prototype property hits before caching a prototype in the LLInt. A count of 0 means never cache.") \
    457     \
    458     v(bool, dumpCompiledRegExpPatterns, false, Normal, nullptr) \
    459     \
    460     v(bool, dumpModuleRecord, false, Normal, nullptr) \
    461     v(bool, dumpModuleLoadingState, false, Normal, nullptr) \
    462     v(bool, exposeInternalModuleLoader, false, Normal, "expose the internal module loader object to the global space for debugging") \
    463     \
    464     v(bool, useSuperSampler, false, Normal, nullptr) \
    465     \
    466     v(bool, useSourceProviderCache, true, Normal, "If false, the parser will not use the source provider cache. It's good to verify everything works when this is false. Because the cache is so successful, it can mask bugs.") \
    467     v(bool, useCodeCache, true, Normal, "If false, the unlinked byte code cache will not be used.") \
    468     \
    469     v(bool, useWebAssembly, true, Normal, "Expose the WebAssembly global object.") \
    470     \
    471     v(bool, enableSpectreMitigations, true, Restricted, "Enable Spectre mitigations.") \
    472     v(bool, enableSpectreGadgets, false, Restricted, "enable gadgets to test Spectre mitigations.") \
    473     v(bool, zeroStackFrame, false, Normal, "Zero stack frame on entry to a function.") \
    474     \
    475     v(bool, failToCompileWebAssemblyCode, false, Normal, "If true, no Wasm::Plan will sucessfully compile a function.") \
    476     v(size, webAssemblyPartialCompileLimit, 5000, Normal, "Limit on the number of bytes a Wasm::Plan::compile should attempt before checking for other work.") \
    477     v(unsigned, webAssemblyBBQAirOptimizationLevel, 0, Normal, "Air Optimization level for BBQ Web Assembly module compilations.") \
    478     v(unsigned, webAssemblyBBQB3OptimizationLevel, 1, Normal, "B3 Optimization level for BBQ Web Assembly module compilations.") \
    479     v(unsigned, webAssemblyOMGOptimizationLevel, Options::defaultB3OptLevel(), Normal, "B3 Optimization level for OMG Web Assembly module compilations.") \
    480     \
    481     v(bool, useBBQTierUpChecks, true, Normal, "Enables tier up checks for our BBQ code.") \
    482     v(bool, useWebAssemblyOSR, true, Normal, nullptr) \
    483     v(int32, thresholdForOMGOptimizeAfterWarmUp, 50000, Normal, "The count before we tier up a function to OMG.") \
    484     v(int32, thresholdForOMGOptimizeSoon, 500, Normal, nullptr) \
    485     v(int32, omgTierUpCounterIncrementForLoop, 1, Normal, "The amount the tier up counter is incremented on each loop backedge.") \
    486     v(int32, omgTierUpCounterIncrementForEntry, 15, Normal, "The amount the tier up counter is incremented on each function entry.") \
    487     /* FIXME: enable fast memories on iOS and pre-allocate them. https://bugs.webkit.org/show_bug.cgi?id=170774 */ \
    488     v(bool, useWebAssemblyFastMemory, !isIOS(), Normal, "If true, we will try to use a 32-bit address space with a signal handler to bounds check wasm memory.") \
    489     v(bool, logWebAssemblyMemory, false, Normal, nullptr) \
    490     v(unsigned, webAssemblyFastMemoryRedzonePages, 128, Normal, "WebAssembly fast memories use 4GiB virtual allocations, plus a redzone (counted as multiple of 64KiB WebAssembly pages) at the end to catch reg+imm accesses which exceed 32-bit, anything beyond the redzone is explicitly bounds-checked") \
    491     v(bool, crashIfWebAssemblyCantFastMemory, false, Normal, "If true, we will crash if we can't obtain fast memory for wasm.") \
    492     v(unsigned, maxNumWebAssemblyFastMemories, 4, Normal, nullptr) \
    493     v(bool, useFastTLSForWasmContext, true, Normal, "If true, we will store context in fast TLS. If false, we will pin it to a register.") \
    494     v(bool, wasmBBQUsesAir, true, Normal, nullptr) \
    495     v(size, webAssemblyBBQAirModeThreshold, isIOS() ? (10 * MB) : 0, Normal, "If 0, we always use BBQ Air. If Wasm module code size hits this threshold, we compile Wasm module with B3 BBQ mode.") \
    496     v(bool, useWebAssemblyStreamingApi, enableWebAssemblyStreamingApi, Normal, "Allow to run WebAssembly's Streaming API") \
    497     v(bool, useCallICsForWebAssemblyToJSCalls, true, Normal, "If true, we will use CallLinkInfo to inline cache Wasm to JS calls.") \
    498     v(bool, useEagerWebAssemblyModuleHashing, false, Normal, "Unnamed WebAssembly modules are identified in backtraces through their hash, if available.") \
    499     v(bool, useWebAssemblyReferences, true, Normal, "Allow types from the wasm references spec.") \
    500     v(bool, useWeakRefs, false, Normal, "Expose the WeakRef constructor.") \
    501     v(bool, useBigInt, false, Normal, "If true, we will enable BigInt support.") \
    502     v(bool, useNullishAwareOperators, false, Normal, "Enable support for ?. and ?? operators.") \
    503     v(bool, useArrayAllocationProfiling, true, Normal, "If true, we will use our normal array allocation profiling. If false, the allocation profile will always claim to be undecided.") \
    504     v(bool, forcePolyProto, false, Normal, "If true, create_this will always create an object with a poly proto structure.") \
    505     v(bool, forceMiniVMMode, false, Normal, "If true, it will force mini VM mode on.") \
    506     v(bool, useTracePoints, false, Normal, nullptr) \
    507     v(bool, traceLLIntExecution, false, Configurable, nullptr) \
    508     v(bool, traceLLIntSlowPath, false, Configurable, nullptr) \
    509     v(bool, traceBaselineJITExecution, false, Normal, nullptr) \
    510     v(unsigned, thresholdForGlobalLexicalBindingEpoch, UINT_MAX, Normal, "Threshold for global lexical binding epoch. If the epoch reaches to this value, CodeBlock metadata for scope operations will be revised globally. It needs to be greater than 1.") \
    511     v(optionString, diskCachePath, nullptr, Restricted, nullptr) \
    512     v(bool, forceDiskCache, false, Restricted, nullptr) \
    513     v(bool, validateAbstractInterpreterState, false, Restricted, nullptr) \
    514     v(double, validateAbstractInterpreterStateProbability, 0.5, Normal, nullptr) \
    515     v(optionString, dumpJITMemoryPath, nullptr, Restricted, nullptr) \
    516     v(double, dumpJITMemoryFlushInterval, 10, Restricted, "Maximum time in between flushes of the JIT memory dump in seconds.") \
    517     v(bool, useUnlinkedCodeBlockJettisoning, false, Normal, "If true, UnlinkedCodeBlock can be jettisoned.") \
    518 
    519 
    520 enum OptionEquivalence {
    521     SameOption,
    522     InvertedOption,
    523 };
    524 
    525 #define JSC_ALIASED_OPTIONS(v) \
    526     v(enableFunctionDotArguments, useFunctionDotArguments, SameOption) \
    527     v(enableTailCalls, useTailCalls, SameOption) \
    528     v(showDisassembly, dumpDisassembly, SameOption) \
    529     v(showDFGDisassembly, dumpDFGDisassembly, SameOption) \
    530     v(showFTLDisassembly, dumpFTLDisassembly, SameOption) \
    531     v(showAllDFGNodes, dumpAllDFGNodes, SameOption) \
    532     v(alwaysDoFullCollection, useGenerationalGC, InvertedOption) \
    533     v(enableOSREntryToDFG, useOSREntryToDFG, SameOption) \
    534     v(enableOSREntryToFTL, useOSREntryToFTL, SameOption) \
    535     v(enableAccessInlining, useAccessInlining, SameOption) \
    536     v(enablePolyvariantDevirtualization, usePolyvariantDevirtualization, SameOption) \
    537     v(enablePolymorphicAccessInlining, usePolymorphicAccessInlining, SameOption) \
    538     v(enablePolymorphicCallInlining, usePolymorphicCallInlining, SameOption) \
    539     v(enableMovHintRemoval, useMovHintRemoval, SameOption) \
    540     v(enableObjectAllocationSinking, useObjectAllocationSinking, SameOption) \
    541     v(enableConcurrentJIT, useConcurrentJIT, SameOption) \
    542     v(enableProfiler, useProfiler, SameOption) \
    543     v(enableArchitectureSpecificOptimizations, useArchitectureSpecificOptimizations, SameOption) \
    544     v(enablePolyvariantCallInlining, usePolyvariantCallInlining, SameOption) \
    545     v(enablePolyvariantByIdInlining, usePolyvariantByIdInlining, SameOption) \
    546     v(objectsAreImmortal, useImmortalObjects, SameOption) \
    547     v(showObjectStatistics, dumpObjectStatistics, SameOption) \
    548     v(disableGC, useGC, InvertedOption) \
    549     v(enableTypeProfiler, useTypeProfiler, SameOption) \
    550     v(enableControlFlowProfiler, useControlFlowProfiler, SameOption) \
    551     v(enableExceptionFuzz, useExceptionFuzz, SameOption) \
    552     v(enableExecutableAllocationFuzz, useExecutableAllocationFuzz, SameOption) \
    553     v(enableOSRExitFuzz, useOSRExitFuzz, SameOption) \
    554     v(enableDollarVM, useDollarVM, SameOption) \
    555     v(enableWebAssembly, useWebAssembly, SameOption) \
    556     v(verboseDFGByteCodeParsing, verboseDFGBytecodeParsing, SameOption) \
    557     v(maximumOptimizationCandidateInstructionCount, maximumOptimizationCandidateBytecodeCost, SameOption) \
    558     v(maximumFunctionForCallInlineCandidateInstructionCount, maximumFunctionForCallInlineCandidateBytecodeCost, SameOption) \
    559     v(maximumFunctionForClosureCallInlineCandidateInstructionCount, maximumFunctionForClosureCallInlineCandidateBytecodeCost, SameOption) \
    560     v(maximumFunctionForConstructInlineCandidateInstructionCount, maximumFunctionForConstructInlineCandidateBytecoodeCost, SameOption) \
    561     v(maximumFTLCandidateInstructionCount, maximumFTLCandidateBytecodeCost, SameOption) \
    562     v(maximumInliningCallerSize, maximumInliningCallerBytecodeCost, SameOption) \
    563 
    56481
    56582class Options {
    … …  
    57895    };
    57996
    580     // This typedef is to allow us to eliminate the '_' in the field name in
    581     // union inside Entry. This is needed to keep the style checker happy.
    582     typedef int32_t int32;
    583     typedef size_t size;
    584 
    585     // Declare the option IDs:
     97#define DECLARE_OPTION_ID(type_, name_, defaultValue_, availability_, description_) \
     98    name_##ID,
     99
    586100    enum ID {
    587 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
    588         name_##ID,
    589         JSC_OPTIONS(FOR_EACH_OPTION)
    590 #undef FOR_EACH_OPTION
     101        FOR_EACH_JSC_OPTION(DECLARE_OPTION_ID)
    591102        numberOfOptions
    592103    };
     104#undef DECLARE_OPTION_ID
    593105
    594106    enum class Type {
    595         boolType,
    596         unsignedType,
    597         doubleType,
    598         int32Type,
    599         sizeType,
    600         optionRangeType,
    601         optionStringType,
    602         gcLogLevelType,
     107        Bool,
     108        Unsigned,
     109        Double,
     110        Int32,
     111        Size,
     112        OptionRange,
     113        OptionString,
     114        GCLogLevel,
    603115    };
    604116
    … …  
    618130    JS_EXPORT_PRIVATE static void ensureOptionsAreCoherent();
    619131
    620     JS_EXPORT_PRIVATE static void enableRestrictedOptions(bool enableOrNot);
    621 
    622     // Declare accessors for each option:
    623 #define FOR_EACH_OPTION(type_, name_, defaultValue_, availability_, description_) \
    624     ALWAYS_INLINE static type_& name_() { return s_options[name_##ID].type_##Val; } \
    625     ALWAYS_INLINE static type_& name_##Default() { return s_defaultOptions[name_##ID].type_##Val; }
    626 
    627     JSC_OPTIONS(FOR_EACH_OPTION)
    628 #undef FOR_EACH_OPTION
     132#define DECLARE_OPTION_ACCESSORS(type_, name_, defaultValue_, availability_, description_) \
     133    ALWAYS_INLINE static OptionEntry::type_& name_() { return g_jscConfig.options[name_##ID].val##type_; }  \
     134    ALWAYS_INLINE static OptionEntry::type_& name_##Default() { return g_jscConfig.defaultOptions[name_##ID].val##type_; }
     135
     136    FOR_EACH_JSC_OPTION(DECLARE_OPTION_ACCESSORS)
     137#undef DECLARE_OPTION_ACCESSORS
    629138
    630139    static bool isAvailable(ID, Availability);
    631140
    632141private:
    633     // For storing for an option value:
    634     union Entry {
    635         bool boolVal;
    636         unsigned unsignedVal;
    637         double doubleVal;
    638         int32 int32Val;
    639         size sizeVal;
    640         OptionRange optionRangeVal;
    641         const char* optionStringVal;
    642         GCLogging::Level gcLogLevelVal;
    643     };
    644142
    645143    // For storing constant meta data about each option:
    … …  
    667165    static bool overrideAliasedOptionWithHeuristic(const char* name);
    668166
    669     // Declare the singleton instance of the options store:
    670     JS_EXPORT_PRIVATE static Entry s_options[numberOfOptions];
    671     JS_EXPORT_PRIVATE static Entry s_defaultOptions[numberOfOptions];
    672167    static const EntryInfo s_optionsInfo[numberOfOptions];
    673168
    … …  
    679174    Option(Options::ID id)
    680175        : m_id(id)
    681         , m_entry(Options::s_options[m_id])
     176        , m_entry(g_jscConfig.options[m_id])
    682177    {
    683178    }
    … …  
    706201private:
    707202    // Only used for constructing default Options.
    708     Option(Options::ID id, Options::Entry& entry)
     203    Option(Options::ID id, OptionEntry& entry)
    709204        : m_id(id)
    710205        , m_entry(entry)
    … …  
    713208   
    714209    Options::ID m_id;
    715     Options::Entry& m_entry;
     210    OptionEntry& m_entry;
    716211};
    717212
    … …  
    743238inline const Option Option::defaultOption() const
    744239{
    745     return Option(m_id, Options::s_defaultOptions[m_id]);
     240    return Option(m_id, g_jscConfig.defaultOptions[m_id]);
    746241}
    747242
    748243inline bool& Option::boolVal()
    749244{
    750     return m_entry.boolVal;
     245    return m_entry.valBool;
    751246}
    752247
    753248inline unsigned& Option::unsignedVal()
    754249{
    755     return m_entry.unsignedVal;
     250    return m_entry.valUnsigned;
    756251}
    757252
    758253inline double& Option::doubleVal()
    759254{
    760     return m_entry.doubleVal;
     255    return m_entry.valDouble;
    761256}
    762257
    763258inline int32_t& Option::int32Val()
    764259{
    765     return m_entry.int32Val;
     260    return m_entry.valInt32;
    766261}
    767262
    768263inline OptionRange Option::optionRangeVal()
    769264{
    770     return m_entry.optionRangeVal;
     265    return m_entry.valOptionRange;
    771266}
    772267
    773268inline const char* Option::optionStringVal()
    774269{
    775     return m_entry.optionStringVal;
     270    return m_entry.valOptionString;
    776271}
    777272
    778273inline GCLogging::Level& Option::gcLogLevelVal()
    779274{
    780     return m_entry.gcLogLevelVal;
     275    return m_entry.valGCLogLevel;
    781276}
    782277

  • TabularUnified trunk/Source/JavaScriptCore/runtime/VM.cpp

    r249780 r249808  
    471471
    472472    VMInspector::instance().add(this);
     473
     474    if (!g_jscConfig.disabledFreezingForTesting)
     475        Config::permanentlyFreeze();
    473476}
    474477

  • TabularUnified trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp

    r249518 r249808  
    11/*
    2  * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    103103FunctionOverrides::FunctionOverrides(const char* overridesFileName)
    104104{
     105    RELEASE_ASSERT(g_jscConfig.restrictedOptionsEnabled);
    105106    parseOverridesInFile(holdLock(m_lock), overridesFileName);
    106107}
    … …  
    108109void FunctionOverrides::reinstallOverrides()
    109110{
     111    RELEASE_ASSERT(g_jscConfig.restrictedOptionsEnabled);
    110112    FunctionOverrides& overrides = FunctionOverrides::overrides();
    111113    auto locker = holdLock(overrides.m_lock);
    … …  
    144146bool FunctionOverrides::initializeOverrideFor(const SourceCode& origCode, FunctionOverrides::OverrideInfo& result)
    145147{
    146     ASSERT(Options::functionOverrides());
     148    RELEASE_ASSERT(g_jscConfig.restrictedOptionsEnabled);
     149    RELEASE_ASSERT(Options::functionOverrides());
    147150    FunctionOverrides& overrides = FunctionOverrides::overrides();
    148151
    … …  
    236239void FunctionOverrides::parseOverridesInFile(const AbstractLocker&, const char* fileName)
    237240{
     241    RELEASE_ASSERT(g_jscConfig.restrictedOptionsEnabled);
    238242    if (!fileName)
    239243        return;

  • TabularUnified trunk/Source/JavaScriptCore/tools/JSDollarVM.cpp

    r249708 r249808  
    3131#include "DOMAttributeGetterSetter.h"
    3232#include "DOMJITGetterSetter.h"
     33#include "Debugger.h"
    3334#include "FrameTracers.h"
    3435#include "FunctionCodeBlock.h"
    … …  
    4142#include "JSProxy.h"
    4243#include "JSString.h"
     44#include "Options.h"
    4345#include "Parser.h"
    4446#include "ShadowChicken.h"
    … …  
    6365namespace {
    6466
     67// We must RELEASE_ASSERT(Options::useDollarVM()) in all JSDollarVM functions
     68// that are non-trivial at an eye's glance. This includes (but is not limited to):
     69//      constructors
     70//      create() factory
     71//      createStructure() factory
     72//      finishCreation()
     73//      HOST_CALL or operation functions
     74//      Constructors and methods of utility and test classes
     75//
     76// The only exception are some constexpr constructors used for instantiating
     77// globals (since these must have trivial constructors) e.g. DOMJITAttribute.
     78// Instead, these constructors should always be ALWAYS_INLINE.
     79
    6580class JSDollarVMCallFrame : public JSDestructibleObject {
    6681    using Base = JSDestructibleObject;
    … …  
    6883    JSDollarVMCallFrame(VM& vm, Structure* structure)
    6984        : Base(vm, structure)
    70     { }
     85    {
     86        RELEASE_ASSERT(Options::useDollarVM());
     87    }
    7188
    7289    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    7390    {
     91        RELEASE_ASSERT(Options::useDollarVM());
    7492        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    7593    }
    … …  
    7795    static JSDollarVMCallFrame* create(ExecState* exec, unsigned requestedFrameIndex)
    7896    {
     97        RELEASE_ASSERT(Options::useDollarVM());
    7998        VM& vm = exec->vm();
    8099        JSGlobalObject* globalObject = exec->lexicalGlobalObject();
    … …  
    87106    void finishCreation(VM& vm, CallFrame* frame, unsigned requestedFrameIndex)
    88107    {
     108        RELEASE_ASSERT(Options::useDollarVM());
    89109        Base::finishCreation(vm);
    90110
    … …  
    124144    void addProperty(VM& vm, const char* name, JSValue value)
    125145    {
     146        RELEASE_ASSERT(Options::useDollarVM());
    126147        Identifier identifier = Identifier::fromString(vm, name);
    127148        putDirect(vm, identifier, value);
    … …  
    139160        : Base(vm, structure)
    140161    {
     162        RELEASE_ASSERT(Options::useDollarVM());
    141163    }
    142164
    … …  
    148170    static Element* create(VM& vm, JSGlobalObject* globalObject, Root* root)
    149171    {
     172        RELEASE_ASSERT(Options::useDollarVM());
    150173        Structure* structure = createStructure(vm, globalObject, jsNull());
    151174        Element* element = new (NotNull, allocateCell<Element>(vm.heap)) Element(vm, structure);
    … …  
    168191    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    169192    {
     193        RELEASE_ASSERT(Options::useDollarVM());
    170194        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    171195    }
    … …  
    194218        : Base(vm, structure)
    195219    {
     220        RELEASE_ASSERT(Options::useDollarVM());
    196221    }
    197222
    … …  
    209234    static Root* create(VM& vm, JSGlobalObject* globalObject)
    210235    {
     236        RELEASE_ASSERT(Options::useDollarVM());
    211237        Structure* structure = createStructure(vm, globalObject, jsNull());
    212238        Root* root = new (NotNull, allocateCell<Root>(vm.heap)) Root(vm, structure);
    … …  
    221247    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    222248    {
     249        RELEASE_ASSERT(Options::useDollarVM());
    223250        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    224251    }
    … …  
    240267        : Base(vm, structure)
    241268    {
     269        RELEASE_ASSERT(Options::useDollarVM());
    242270    }
    243271
    … …  
    247275    static SimpleObject* create(VM& vm, JSGlobalObject* globalObject)
    248276    {
     277        RELEASE_ASSERT(Options::useDollarVM());
    249278        Structure* structure = createStructure(vm, globalObject, jsNull());
    250279        SimpleObject* simpleObject = new (NotNull, allocateCell<SimpleObject>(vm.heap)) SimpleObject(vm, structure);
    … …  
    263292    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    264293    {
     294        RELEASE_ASSERT(Options::useDollarVM());
    265295        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    266296    }
    … …  
    288318        : Base(vm, structure)
    289319    {
     320        RELEASE_ASSERT(Options::useDollarVM());
    290321    }
    291322
    … …  
    296327    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    297328    {
     329        RELEASE_ASSERT(Options::useDollarVM());
    298330        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    299331    }
    … …  
    301333    static ImpureGetter* create(VM& vm, Structure* structure, JSObject* delegate)
    302334    {
     335        RELEASE_ASSERT(Options::useDollarVM());
    303336        ImpureGetter* getter = new (NotNull, allocateCell<ImpureGetter>(vm.heap)) ImpureGetter(vm, structure);
    304337        getter->finishCreation(vm, delegate);
    … …  
    308341    void finishCreation(VM& vm, JSObject* delegate)
    309342    {
     343        RELEASE_ASSERT(Options::useDollarVM());
    310344        Base::finishCreation(vm);
    311345        if (delegate)
    … …  
    315349    static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName name, PropertySlot& slot)
    316350    {
     351        RELEASE_ASSERT(Options::useDollarVM());
    317352        VM& vm = exec->vm();
    318353        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    350385        : Base(vm, structure)
    351386    {
     387        RELEASE_ASSERT(Options::useDollarVM());
    352388    }
    353389
    … …  
    358394    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    359395    {
     396        RELEASE_ASSERT(Options::useDollarVM());
    360397        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    361398    }
    … …  
    363400    static CustomGetter* create(VM& vm, Structure* structure)
    364401    {
     402        RELEASE_ASSERT(Options::useDollarVM());
    365403        CustomGetter* getter = new (NotNull, allocateCell<CustomGetter>(vm.heap)) CustomGetter(vm, structure);
    366404        getter->finishCreation(vm);
    … …  
    370408    static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
    371409    {
     410        RELEASE_ASSERT(Options::useDollarVM());
    372411        VM& vm = exec->vm();
    373412        CustomGetter* thisObject = jsCast<CustomGetter*>(object);
    … …  
    388427    static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    389428    {
     429        RELEASE_ASSERT(Options::useDollarVM());
    390430        VM& vm = exec->vm();
    391431        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    403443    static EncodedJSValue customGetterAcessor(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    404444    {
     445        RELEASE_ASSERT(Options::useDollarVM());
    405446        VM& vm = exec->vm();
    406447        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    424465    static RuntimeArray* create(ExecState* exec)
    425466    {
     467        RELEASE_ASSERT(Options::useDollarVM());
    426468        VM& vm = exec->vm();
    427469        JSGlobalObject* globalObject = exec->lexicalGlobalObject();
    … …  
    437479    static void destroy(JSCell* cell)
    438480    {
     481        RELEASE_ASSERT(Options::useDollarVM());
    439482        static_cast<RuntimeArray*>(cell)->RuntimeArray::~RuntimeArray();
    440483    }
    … …  
    444487    static bool getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
    445488    {
     489        RELEASE_ASSERT(Options::useDollarVM());
    446490        VM& vm = exec->vm();
    447491        RuntimeArray* thisObject = jsCast<RuntimeArray*>(object);
    … …  
    462506    static bool getOwnPropertySlotByIndex(JSObject* object, ExecState* exec, unsigned index, PropertySlot& slot)
    463507    {
     508        RELEASE_ASSERT(Options::useDollarVM());
    464509        RuntimeArray* thisObject = jsCast<RuntimeArray*>(object);
    465510        if (index < thisObject->getLength()) {
    … …  
    487532    static ArrayPrototype* createPrototype(VM&, JSGlobalObject* globalObject)
    488533    {
     534        RELEASE_ASSERT(Options::useDollarVM());
    489535        return globalObject->arrayPrototype();
    490536    }
    … …  
    492538    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    493539    {
     540        RELEASE_ASSERT(Options::useDollarVM());
    494541        return Structure::create(vm, globalObject, prototype, TypeInfo(DerivedArrayType, StructureFlags), info(), ArrayClass);
    495542    }
    … …  
    498545    void finishCreation(ExecState* exec)
    499546    {
     547        RELEASE_ASSERT(Options::useDollarVM());
    500548        VM& vm = exec->vm();
    501549        Base::finishCreation(vm);
    … …  
    510558        : JSArray(exec->vm(), structure, 0)
    511559    {
     560        RELEASE_ASSERT(Options::useDollarVM());
    512561    }
    513562
    514563    static EncodedJSValue lengthGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    515564    {
     565        RELEASE_ASSERT(Options::useDollarVM());
    516566        VM& vm = exec->vm();
    517567        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    531581        : Base(vm, structure)
    532582    {
     583        RELEASE_ASSERT(Options::useDollarVM());
    533584    }
    534585
    … …  
    539590    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    540591    {
     592        RELEASE_ASSERT(Options::useDollarVM());
    541593        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    542594    }
    … …  
    545597    static Ref<Snippet> checkSubClassSnippet()
    546598    {
     599        RELEASE_ASSERT(Options::useDollarVM());
    547600        Ref<Snippet> snippet = Snippet::create();
    548601        snippet->setGenerator([=](CCallHelpers& jit, SnippetParams& params) {
    … …  
    557610    static DOMJITNode* create(VM& vm, Structure* structure)
    558611    {
     612        RELEASE_ASSERT(Options::useDollarVM());
    559613        DOMJITNode* getter = new (NotNull, allocateCell<DOMJITNode>(vm.heap)) DOMJITNode(vm, structure);
    560614        getter->finishCreation(vm);
    … …  
    578632        : Base(vm, structure)
    579633    {
     634        RELEASE_ASSERT(Options::useDollarVM());
    580635    }
    581636
    … …  
    586641    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    587642    {
     643        RELEASE_ASSERT(Options::useDollarVM());
    588644        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    589645    }
    … …  
    591647    static DOMJITGetter* create(VM& vm, Structure* structure)
    592648    {
     649        RELEASE_ASSERT(Options::useDollarVM());
    593650        DOMJITGetter* getter = new (NotNull, allocateCell<DOMJITGetter>(vm.heap)) DOMJITGetter(vm, structure);
    594651        getter->finishCreation(vm);
    … …  
    598655    class DOMJITAttribute : public DOMJIT::GetterSetter {
    599656    public:
    600         constexpr DOMJITAttribute()
     657        ALWAYS_INLINE constexpr DOMJITAttribute()
    601658            : DOMJIT::GetterSetter(
    602659                DOMJITGetter::customGetter,
    … …  
    613670        static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
    614671        {
     672            RELEASE_ASSERT(Options::useDollarVM());
    615673            VM& vm = exec->vm();
    616674            NativeCallFrameTracer tracer(vm, exec);
    … …  
    620678        static Ref<DOMJIT::CallDOMGetterSnippet> callDOMGetter()
    621679        {
     680            RELEASE_ASSERT(Options::useDollarVM());
    622681            Ref<DOMJIT::CallDOMGetterSnippet> snippet = DOMJIT::CallDOMGetterSnippet::create();
    623682            snippet->requireGlobalObject = false;
    … …  
    639698    static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    640699    {
     700        RELEASE_ASSERT(Options::useDollarVM());
    641701        VM& vm = exec->vm();
    642702        DOMJITNode* thisObject = jsDynamicCast<DOMJITNode*>(vm, JSValue::decode(thisValue));
    … …  
    650710void DOMJITGetter::finishCreation(VM& vm)
    651711{
     712    RELEASE_ASSERT(Options::useDollarVM());
    652713    Base::finishCreation(vm);
    653714    const DOMJIT::GetterSetter* domJIT = &DOMJITGetterDOMJIT;
    … …  
    661722        : Base(vm, structure)
    662723    {
     724        RELEASE_ASSERT(Options::useDollarVM());
    663725    }
    664726
    … …  
    669731    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    670732    {
     733        RELEASE_ASSERT(Options::useDollarVM());
    671734        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    672735    }
    … …  
    674737    static DOMJITGetterComplex* create(VM& vm, JSGlobalObject* globalObject, Structure* structure)
    675738    {
     739        RELEASE_ASSERT(Options::useDollarVM());
    676740        DOMJITGetterComplex* getter = new (NotNull, allocateCell<DOMJITGetterComplex>(vm.heap)) DOMJITGetterComplex(vm, structure);
    677741        getter->finishCreation(vm, globalObject);
    … …  
    681745    class DOMJITAttribute : public DOMJIT::GetterSetter {
    682746    public:
    683         constexpr DOMJITAttribute()
     747        ALWAYS_INLINE constexpr DOMJITAttribute()
    684748            : DOMJIT::GetterSetter(
    685749                DOMJITGetterComplex::customGetter,
    … …  
    696760        static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
    697761        {
     762            RELEASE_ASSERT(Options::useDollarVM());
    698763            VM& vm = exec->vm();
    699764            NativeCallFrameTracer tracer(vm, exec);
    … …  
    710775        static Ref<DOMJIT::CallDOMGetterSnippet> callDOMGetter()
    711776        {
     777            RELEASE_ASSERT(Options::useDollarVM());
    712778            Ref<DOMJIT::CallDOMGetterSnippet> snippet = DOMJIT::CallDOMGetterSnippet::create();
    713779            static_assert(GPRInfo::numberOfRegisters >= 4, "Number of registers should be larger or equal to 4.");
    … …  
    734800    static EncodedJSValue JSC_HOST_CALL functionEnableException(ExecState* exec)
    735801    {
     802        RELEASE_ASSERT(Options::useDollarVM());
    736803        VM& vm = exec->vm();
    737804        auto* object = jsDynamicCast<DOMJITGetterComplex*>(vm, exec->thisValue());
    … …  
    743810    static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    744811    {
     812        RELEASE_ASSERT(Options::useDollarVM());
    745813        VM& vm = exec->vm();
    746814        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    760828void DOMJITGetterComplex::finishCreation(VM& vm, JSGlobalObject* globalObject)
    761829{
     830    RELEASE_ASSERT(Options::useDollarVM());
    762831    Base::finishCreation(vm);
    763832    const DOMJIT::GetterSetter* domJIT = &DOMJITGetterComplexDOMJIT;
    … …  
    772841        : Base(vm, structure)
    773842    {
     843        RELEASE_ASSERT(Options::useDollarVM());
    774844    }
    775845
    … …  
    778848    static const unsigned StructureFlags = Base::StructureFlags;
    779849
    780 
    781850    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    782851    {
     852        RELEASE_ASSERT(Options::useDollarVM());
    783853        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    784854    }
    … …  
    786856    static DOMJITFunctionObject* create(VM& vm, JSGlobalObject* globalObject, Structure* structure)
    787857    {
     858        RELEASE_ASSERT(Options::useDollarVM());
    788859        DOMJITFunctionObject* object = new (NotNull, allocateCell<DOMJITFunctionObject>(vm.heap)) DOMJITFunctionObject(vm, structure);
    789860        object->finishCreation(vm, globalObject);
    … …  
    793864    static EncodedJSValue JSC_HOST_CALL functionWithTypeCheck(ExecState* exec)
    794865    {
     866        RELEASE_ASSERT(Options::useDollarVM());
    795867        VM& vm = exec->vm();
     868        NativeCallFrameTracer tracer(vm, exec);
    796869        auto scope = DECLARE_THROW_SCOPE(vm);
    797870
    … …  
    804877    static EncodedJSValue JIT_OPERATION functionWithoutTypeCheck(ExecState* exec, DOMJITNode* node)
    805878    {
     879        RELEASE_ASSERT(Options::useDollarVM());
    806880        VM& vm = exec->vm();
    807881        NativeCallFrameTracer tracer(vm, exec);
    … …  
    812886    static Ref<Snippet> checkSubClassSnippet()
    813887    {
     888        RELEASE_ASSERT(Options::useDollarVM());
    814889        Ref<Snippet> snippet = Snippet::create();
    815890        snippet->numFPScratchRegisters = 1;
    … …  
    834909void DOMJITFunctionObject::finishCreation(VM& vm, JSGlobalObject* globalObject)
    835910{
     911    RELEASE_ASSERT(Options::useDollarVM());
    836912    Base::finishCreation(vm);
    837913    putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITFunctionObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
    … …  
    843919        : Base(vm, structure)
    844920    {
     921        RELEASE_ASSERT(Options::useDollarVM());
    845922    }
    846923
    … …  
    849926    static const unsigned StructureFlags = Base::StructureFlags;
    850927
    851 
    852928    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    853929    {
     930        RELEASE_ASSERT(Options::useDollarVM());
    854931        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    855932    }
    … …  
    857934    static DOMJITCheckSubClassObject* create(VM& vm, JSGlobalObject* globalObject, Structure* structure)
    858935    {
     936        RELEASE_ASSERT(Options::useDollarVM());
    859937        DOMJITCheckSubClassObject* object = new (NotNull, allocateCell<DOMJITCheckSubClassObject>(vm.heap)) DOMJITCheckSubClassObject(vm, structure);
    860938        object->finishCreation(vm, globalObject);
    … …  
    864942    static EncodedJSValue JSC_HOST_CALL functionWithTypeCheck(ExecState* exec)
    865943    {
     944        RELEASE_ASSERT(Options::useDollarVM());
    866945        VM& vm = exec->vm();
    867946        auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    875954    static EncodedJSValue JIT_OPERATION functionWithoutTypeCheck(ExecState* exec, DOMJITNode* node)
    876955    {
     956        RELEASE_ASSERT(Options::useDollarVM());
    877957        VM& vm = exec->vm();
    878958        NativeCallFrameTracer tracer(vm, exec);
    … …  
    888968void DOMJITCheckSubClassObject::finishCreation(VM& vm, JSGlobalObject* globalObject)
    889969{
     970    RELEASE_ASSERT(Options::useDollarVM());
    890971    Base::finishCreation(vm);
    891972    putDirectNativeFunction(vm, globalObject, Identifier::fromString(vm, "func"), 0, functionWithTypeCheck, NoIntrinsic, &DOMJITCheckSubClassObjectSignature, static_cast<unsigned>(PropertyAttribute::ReadOnly));
    … …  
    897978        : Base(vm, structure)
    898979    {
     980        RELEASE_ASSERT(Options::useDollarVM());
    899981    }
    900982
    … …  
    905987    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    906988    {
     989        RELEASE_ASSERT(Options::useDollarVM());
    907990        return Structure::create(vm, globalObject, prototype, TypeInfo(JSC::JSType(LastJSCObjectType + 1), StructureFlags), info());
    908991    }
    … …  
    910993    static DOMJITGetterBaseJSObject* create(VM& vm, Structure* structure)
    911994    {
     995        RELEASE_ASSERT(Options::useDollarVM());
    912996        DOMJITGetterBaseJSObject* getter = new (NotNull, allocateCell<DOMJITGetterBaseJSObject>(vm.heap)) DOMJITGetterBaseJSObject(vm, structure);
    913997        getter->finishCreation(vm);
    … …  
    9171001    class DOMJITAttribute : public DOMJIT::GetterSetter {
    9181002    public:
    919         constexpr DOMJITAttribute()
     1003        ALWAYS_INLINE constexpr DOMJITAttribute()
    9201004            : DOMJIT::GetterSetter(
    9211005                DOMJITGetterBaseJSObject::customGetter,
    … …  
    9321016        static EncodedJSValue JIT_OPERATION slowCall(ExecState* exec, void* pointer)
    9331017        {
     1018            RELEASE_ASSERT(Options::useDollarVM());
    9341019            VM& vm = exec->vm();
    9351020            NativeCallFrameTracer tracer(vm, exec);
    … …  
    9401025        static Ref<DOMJIT::CallDOMGetterSnippet> callDOMGetter()
    9411026        {
     1027            RELEASE_ASSERT(Options::useDollarVM());
    9421028            Ref<DOMJIT::CallDOMGetterSnippet> snippet = DOMJIT::CallDOMGetterSnippet::create();
    9431029            snippet->requireGlobalObject = false;
    … …  
    9591045    static EncodedJSValue customGetter(ExecState* exec, EncodedJSValue thisValue, PropertyName)
    9601046    {
     1047        RELEASE_ASSERT(Options::useDollarVM());
    9611048        VM& vm = exec->vm();
    9621049        JSObject* thisObject = jsDynamicCast<JSObject*>(vm, JSValue::decode(thisValue));
    … …  
    9701057void DOMJITGetterBaseJSObject::finishCreation(VM& vm)
    9711058{
     1059    RELEASE_ASSERT(Options::useDollarVM());
    9721060    Base::finishCreation(vm);
    9731061    const DOMJIT::GetterSetter* domJIT = &DOMJITGetterBaseJSObjectDOMJIT;
    … …  
    9961084    JSTestCustomGetterSetter(VM& vm, Structure* structure)
    9971085        : Base(vm, structure)
    998     { }
     1086    {
     1087        RELEASE_ASSERT(Options::useDollarVM());
     1088    }
    9991089
    10001090    static JSTestCustomGetterSetter* create(VM& vm, JSGlobalObject*, Structure* structure)
    10011091    {
     1092        RELEASE_ASSERT(Options::useDollarVM());
    10021093        JSTestCustomGetterSetter* result = new (NotNull, allocateCell<JSTestCustomGetterSetter>(vm.heap)) JSTestCustomGetterSetter(vm, structure);
    10031094        result->finishCreation(vm);
    … …  
    10091100    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject)
    10101101    {
     1102        RELEASE_ASSERT(Options::useDollarVM());
    10111103        return Structure::create(vm, globalObject, globalObject->objectPrototype(), TypeInfo(ObjectType, StructureFlags), info());
    10121104    }
    … …  
    10311123static bool customSetAccessor(ExecState* exec, EncodedJSValue thisObject, EncodedJSValue encodedValue)
    10321124{
     1125    RELEASE_ASSERT(Options::useDollarVM());
    10331126    VM& vm = exec->vm();
    10341127
    … …  
    10441137static bool customSetValue(ExecState* exec, EncodedJSValue slotValue, EncodedJSValue encodedValue)
    10451138{
     1139    RELEASE_ASSERT(Options::useDollarVM());
    10461140    VM& vm = exec->vm();
    10471141
    … …  
    10591153void JSTestCustomGetterSetter::finishCreation(VM& vm)
    10601154{
     1155    RELEASE_ASSERT(Options::useDollarVM());
    10611156    Base::finishCreation(vm);
    10621157
    … …  
    10911186ElementHandleOwner* Element::handleOwner()
    10921187{
     1188    RELEASE_ASSERT(Options::useDollarVM());
    10931189    static ElementHandleOwner* owner = 0;
    10941190    if (!owner)
    … …  
    10991195void Element::finishCreation(VM& vm, Root* root)
    11001196{
     1197    RELEASE_ASSERT(Options::useDollarVM());
    11011198    Base::finishCreation(vm);
    11021199    setRoot(vm, root);
    … …  
    11311228        , m_streamingParser(m_info.get(), m_client)
    11321229    {
     1230        RELEASE_ASSERT(Options::useDollarVM());
    11331231    }
    11341232
    … …  
    11371235    static WasmStreamingParser* create(VM& vm, JSGlobalObject* globalObject)
    11381236    {
     1237        RELEASE_ASSERT(Options::useDollarVM());
    11391238        Structure* structure = createStructure(vm, globalObject, jsNull());
    11401239        WasmStreamingParser* result = new (NotNull, allocateCell<WasmStreamingParser>(vm.heap)) WasmStreamingParser(vm, structure);
    … …  
    11451244    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    11461245    {
     1246        RELEASE_ASSERT(Options::useDollarVM());
    11471247        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    11481248    }
    … …  
    11521252    void finishCreation(VM& vm)
    11531253    {
     1254        RELEASE_ASSERT(Options::useDollarVM());
    11541255        Base::finishCreation(vm);
    11551256
    … …  
    11701271EncodedJSValue JSC_HOST_CALL functionWasmStreamingParserAddBytes(ExecState* exec)
    11711272{
     1273    RELEASE_ASSERT(Options::useDollarVM());
    11721274    VM& vm = exec->vm();
    11731275    auto scope = DECLARE_THROW_SCOPE(exec->vm());
     1276
    11741277    auto* thisObject = jsDynamicCast<WasmStreamingParser*>(vm, exec->thisValue());
    11751278    if (!thisObject)
    … …  
    11831286EncodedJSValue JSC_HOST_CALL functionWasmStreamingParserFinalize(ExecState* exec)
    11841287{
     1288    RELEASE_ASSERT(Options::useDollarVM());
    11851289    VM& vm = exec->vm();
    11861290    auto* thisObject = jsDynamicCast<WasmStreamingParser*>(vm, exec->thisValue());
    … …  
    12021306static NO_RETURN_DUE_TO_CRASH EncodedJSValue JSC_HOST_CALL functionCrash(ExecState*)
    12031307{
     1308    RELEASE_ASSERT(Options::useDollarVM());
    12041309    CRASH();
    12051310}
    … …  
    12091314static EncodedJSValue JSC_HOST_CALL functionBreakpoint(ExecState* exec)
    12101315{
     1316    RELEASE_ASSERT(Options::useDollarVM());
    12111317    // Nothing should throw here but we might as well double check...
    12121318    VM& vm = exec->vm();
    … …  
    12231329static EncodedJSValue JSC_HOST_CALL functionDFGTrue(ExecState*)
    12241330{
     1331    RELEASE_ASSERT(Options::useDollarVM());
    12251332    return JSValue::encode(jsBoolean(false));
    12261333}
    … …  
    12301337static EncodedJSValue JSC_HOST_CALL functionFTLTrue(ExecState*)
    12311338{
     1339    RELEASE_ASSERT(Options::useDollarVM());
    12321340    return JSValue::encode(jsBoolean(false));
    12331341}
    … …  
    12351343static EncodedJSValue JSC_HOST_CALL functionCpuMfence(ExecState*)
    12361344{
     1345    RELEASE_ASSERT(Options::useDollarVM());
    12371346#if CPU(X86_64) && !OS(WINDOWS)
    12381347    asm volatile("mfence" ::: "memory");
    … …  
    12431352static EncodedJSValue JSC_HOST_CALL functionCpuRdtsc(ExecState*)
    12441353{
     1354    RELEASE_ASSERT(Options::useDollarVM());
    12451355#if CPU(X86_64) && !OS(WINDOWS)
    12461356    unsigned high;
    … …  
    12551365static EncodedJSValue JSC_HOST_CALL functionCpuCpuid(ExecState*)
    12561366{
     1367    RELEASE_ASSERT(Options::useDollarVM());
    12571368#if CPU(X86_64) && !OS(WINDOWS)
    12581369    WTF::x86_cpuid();
    … …  
    12631374static EncodedJSValue JSC_HOST_CALL functionCpuPause(ExecState*)
    12641375{
     1376    RELEASE_ASSERT(Options::useDollarVM());
    12651377#if CPU(X86_64) && !OS(WINDOWS)
    12661378    asm volatile ("pause" ::: "memory");
    … …  
    12801392static EncodedJSValue JSC_HOST_CALL functionCpuClflush(ExecState* exec)
    12811393{
     1394    RELEASE_ASSERT(Options::useDollarVM());
    12821395#if CPU(X86_64) && !OS(WINDOWS)
    12831396    VM& vm = exec->vm();
    … …  
    13251438        , m_jitType(JITType::None)
    13261439    {
     1440        RELEASE_ASSERT(Options::useDollarVM());
    13271441    }
    13281442
    … …  
    13451459static FunctionExecutable* getExecutableForFunction(JSValue theFunctionValue)
    13461460{
     1461    RELEASE_ASSERT(Options::useDollarVM());
    13471462    if (!theFunctionValue.isCell())
    13481463        return nullptr;
    … …  
    13631478static EncodedJSValue JSC_HOST_CALL functionLLintTrue(ExecState* exec)
    13641479{
     1480    RELEASE_ASSERT(Options::useDollarVM());
    13651481    if (!exec)
    13661482        return JSValue::encode(jsUndefined());
    … …  
    13741490static EncodedJSValue JSC_HOST_CALL functionJITTrue(ExecState* exec)
    13751491{
     1492    RELEASE_ASSERT(Options::useDollarVM());
    13761493    if (!exec)
    13771494        return JSValue::encode(jsUndefined());
    … …  
    13871504static EncodedJSValue JSC_HOST_CALL functionNoInline(ExecState* exec)
    13881505{
     1506    RELEASE_ASSERT(Options::useDollarVM());
    13891507    if (exec->argumentCount() < 1)
    13901508        return JSValue::encode(jsUndefined());
    … …  
    14021520static EncodedJSValue JSC_HOST_CALL functionGC(ExecState* exec)
    14031521{
     1522    RELEASE_ASSERT(Options::useDollarVM());
    14041523    VMInspector::gc(exec);
    14051524    return JSValue::encode(jsUndefined());
    … …  
    14101529static EncodedJSValue JSC_HOST_CALL functionEdenGC(ExecState* exec)
    14111530{
     1531    RELEASE_ASSERT(Options::useDollarVM());
    14121532    VMInspector::edenGC(exec);
    14131533    return JSValue::encode(jsUndefined());
    … …  
    14181538static EncodedJSValue JSC_HOST_CALL functionDumpSubspaceHashes(ExecState* exec)
    14191539{
     1540    RELEASE_ASSERT(Options::useDollarVM());
    14201541    VM& vm = exec->vm();
    14211542    VMInspector::dumpSubspaceHashes(&vm);
    … …  
    14391560static EncodedJSValue JSC_HOST_CALL functionCallFrame(ExecState* exec)
    14401561{
     1562    RELEASE_ASSERT(Options::useDollarVM());
    14411563    unsigned frameNumber = 1;
    14421564    if (exec->argumentCount() >= 1) {
    … …  
    14591581static EncodedJSValue JSC_HOST_CALL functionCodeBlockForFrame(ExecState* exec)
    14601582{
     1583    RELEASE_ASSERT(Options::useDollarVM());
    14611584    unsigned frameNumber = 1;
    14621585    if (exec->argumentCount() >= 1) {
    … …  
    14791602static CodeBlock* codeBlockFromArg(ExecState* exec)
    14801603{
     1604    RELEASE_ASSERT(Options::useDollarVM());
    14811605    VM& vm = exec->vm();
    14821606    if (exec->argumentCount() < 1)
    … …  
    15121636static EncodedJSValue JSC_HOST_CALL functionCodeBlockFor(ExecState* exec)
    15131637{
     1638    RELEASE_ASSERT(Options::useDollarVM());
    15141639    CodeBlock* codeBlock = codeBlockFromArg(exec);
    15151640    WTF::StringPrintStream stream;
    … …  
    15251650static EncodedJSValue JSC_HOST_CALL functionDumpSourceFor(ExecState* exec)
    15261651{
     1652    RELEASE_ASSERT(Options::useDollarVM());
    15271653    CodeBlock* codeBlock = codeBlockFromArg(exec);
    15281654    if (codeBlock)
    … …  
    15351661static EncodedJSValue JSC_HOST_CALL functionDumpBytecodeFor(ExecState* exec)
    15361662{
     1663    RELEASE_ASSERT(Options::useDollarVM());
    15371664    CodeBlock* codeBlock = codeBlockFromArg(exec);
    15381665    if (codeBlock)
    … …  
    15431670static EncodedJSValue doPrint(ExecState* exec, bool addLineFeed)
    15441671{
     1672    RELEASE_ASSERT(Options::useDollarVM());
    15451673    auto scope = DECLARE_THROW_SCOPE(exec->vm());
    15461674    for (unsigned i = 0; i < exec->argumentCount(); ++i) {
    … …  
    15661694static EncodedJSValue JSC_HOST_CALL functionDataLog(ExecState* exec)
    15671695{
     1696    RELEASE_ASSERT(Options::useDollarVM());
    15681697    const bool addLineFeed = false;
    15691698    return doPrint(exec, addLineFeed);
    … …  
    15741703static EncodedJSValue JSC_HOST_CALL functionPrint(ExecState* exec)
    15751704{
     1705    RELEASE_ASSERT(Options::useDollarVM());
    15761706    const bool addLineFeed = true;
    15771707    return doPrint(exec, addLineFeed);
    … …  
    15821712static EncodedJSValue JSC_HOST_CALL functionDumpCallFrame(ExecState* exec)
    15831713{
     1714    RELEASE_ASSERT(Options::useDollarVM());
    15841715    // When the callers call this function, they are expecting to dump their
    15851716    // own frame. So skip 1 for this frame.
    … …  
    15921723static EncodedJSValue JSC_HOST_CALL functionDumpStack(ExecState* exec)
    15931724{
     1725    RELEASE_ASSERT(Options::useDollarVM());
    15941726    // When the callers call this function, they are expecting to dump the
    15951727    // stack starting their own frame. So skip 1 for this frame.
    … …  
    16051737static EncodedJSValue JSC_HOST_CALL functionDumpRegisters(ExecState* exec)
    16061738{
     1739    RELEASE_ASSERT(Options::useDollarVM());
    16071740    unsigned requestedFrameIndex = 1;
    16081741    if (exec->argumentCount() >= 1) {
    … …  
    16321765static EncodedJSValue JSC_HOST_CALL functionDumpCell(ExecState* exec)
    16331766{
     1767    RELEASE_ASSERT(Options::useDollarVM());
    16341768    JSValue value = exec->argument(0);
    16351769    if (!value.isCell())
    … …  
    16441778static EncodedJSValue JSC_HOST_CALL functionIndexingMode(ExecState* exec)
    16451779{
     1780    RELEASE_ASSERT(Options::useDollarVM());
    16461781    if (!exec->argument(0).isObject())
    16471782        return encodedJSUndefined();
    … …  
    16541789static EncodedJSValue JSC_HOST_CALL functionInlineCapacity(ExecState* exec)
    16551790{
     1791    RELEASE_ASSERT(Options::useDollarVM());
    16561792    VM& vm = exec->vm();
    16571793    if (auto* object = jsDynamicCast<JSObject*>(vm, exec->argument(0)))
    … …  
    16651801static EncodedJSValue JSC_HOST_CALL functionValue(ExecState* exec)
    16661802{
     1803    RELEASE_ASSERT(Options::useDollarVM());
    16671804    WTF::StringPrintStream stream;
    16681805    for (unsigned i = 0; i < exec->argumentCount(); ++i) {
    … …  
    16791816static EncodedJSValue JSC_HOST_CALL functionGetPID(ExecState*)
    16801817{
     1818    RELEASE_ASSERT(Options::useDollarVM());
    16811819    return JSValue::encode(jsNumber(getCurrentProcessID()));
    16821820}
    … …  
    16861824static EncodedJSValue JSC_HOST_CALL functionHaveABadTime(ExecState* exec)
    16871825{
     1826    RELEASE_ASSERT(Options::useDollarVM());
    16881827    VM& vm = exec->vm();
    16891828    JSLockHolder lock(vm);
    … …  
    17051844static EncodedJSValue JSC_HOST_CALL functionIsHavingABadTime(ExecState* exec)
    17061845{
     1846    RELEASE_ASSERT(Options::useDollarVM());
    17071847    VM& vm = exec->vm();
    17081848    JSLockHolder lock(vm);
    … …  
    17271867static EncodedJSValue JSC_HOST_CALL functionCreateGlobalObject(ExecState* exec)
    17281868{
     1869    RELEASE_ASSERT(Options::useDollarVM());
    17291870    VM& vm = exec->vm();
    17301871    JSLockHolder lock(vm);
    … …  
    17351876static EncodedJSValue JSC_HOST_CALL functionCreateProxy(ExecState* exec)
    17361877{
     1878    RELEASE_ASSERT(Options::useDollarVM());
    17371879    VM& vm = exec->vm();
    17381880    JSLockHolder lock(vm);
    … …  
    17481890static EncodedJSValue JSC_HOST_CALL functionCreateRuntimeArray(ExecState* exec)
    17491891{
     1892    RELEASE_ASSERT(Options::useDollarVM());
    17501893    JSLockHolder lock(exec);
    17511894    RuntimeArray* array = RuntimeArray::create(exec);
    … …  
    17551898static EncodedJSValue JSC_HOST_CALL functionCreateNullRopeString(ExecState* exec)
    17561899{
     1900    RELEASE_ASSERT(Options::useDollarVM());
    17571901    VM& vm = exec->vm();
    17581902    JSLockHolder lock(vm);
    … …  
    17621906static EncodedJSValue JSC_HOST_CALL functionCreateImpureGetter(ExecState* exec)
    17631907{
     1908    RELEASE_ASSERT(Options::useDollarVM());
    17641909    VM& vm = exec->vm();
    17651910    JSLockHolder lock(vm);
    … …  
    17751920static EncodedJSValue JSC_HOST_CALL functionCreateCustomGetterObject(ExecState* exec)
    17761921{
     1922    RELEASE_ASSERT(Options::useDollarVM());
    17771923    VM& vm = exec->vm();
    17781924    JSLockHolder lock(vm);
    … …  
    17841930static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITNodeObject(ExecState* exec)
    17851931{
     1932    RELEASE_ASSERT(Options::useDollarVM());
    17861933    VM& vm = exec->vm();
    17871934    JSLockHolder lock(vm);
    … …  
    17931940static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITGetterObject(ExecState* exec)
    17941941{
     1942    RELEASE_ASSERT(Options::useDollarVM());
    17951943    VM& vm = exec->vm();
    17961944    JSLockHolder lock(vm);
    … …  
    18021950static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITGetterComplexObject(ExecState* exec)
    18031951{
     1952    RELEASE_ASSERT(Options::useDollarVM());
    18041953    VM& vm = exec->vm();
    18051954    JSLockHolder lock(vm);
    … …  
    18111960static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITFunctionObject(ExecState* exec)
    18121961{
     1962    RELEASE_ASSERT(Options::useDollarVM());
    18131963    VM& vm = exec->vm();
    18141964    JSLockHolder lock(vm);
    … …  
    18201970static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITCheckSubClassObject(ExecState* exec)
    18211971{
     1972    RELEASE_ASSERT(Options::useDollarVM());
    18221973    VM& vm = exec->vm();
    18231974    JSLockHolder lock(vm);
    … …  
    18291980static EncodedJSValue JSC_HOST_CALL functionCreateDOMJITGetterBaseJSObject(ExecState* exec)
    18301981{
     1982    RELEASE_ASSERT(Options::useDollarVM());
    18311983    VM& vm = exec->vm();
    18321984    JSLockHolder lock(vm);
    … …  
    18391991static EncodedJSValue JSC_HOST_CALL functionCreateWasmStreamingParser(ExecState* exec)
    18401992{
     1993    RELEASE_ASSERT(Options::useDollarVM());
    18411994    VM& vm = exec->vm();
    18421995    JSLockHolder lock(vm);
    … …  
    18472000static EncodedJSValue JSC_HOST_CALL functionSetImpureGetterDelegate(ExecState* exec)
    18482001{
     2002    RELEASE_ASSERT(Options::useDollarVM());
    18492003    VM& vm = exec->vm();
    18502004    JSLockHolder lock(vm);
    … …  
    18682022static EncodedJSValue JSC_HOST_CALL functionCreateBuiltin(ExecState* exec)
    18692023{
     2024    RELEASE_ASSERT(Options::useDollarVM());
    18702025    VM& vm = exec->vm();
    18712026    auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    18852040static EncodedJSValue JSC_HOST_CALL functionGetPrivateProperty(ExecState* exec)
    18862041{
     2042    RELEASE_ASSERT(Options::useDollarVM());
    18872043    VM& vm = exec->vm();
    18882044    auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    19022058static EncodedJSValue JSC_HOST_CALL functionCreateRoot(ExecState* exec)
    19032059{
     2060    RELEASE_ASSERT(Options::useDollarVM());
    19042061    VM& vm = exec->vm();
    19052062    JSLockHolder lock(vm);
    … …  
    19092066static EncodedJSValue JSC_HOST_CALL functionCreateElement(ExecState* exec)
    19102067{
     2068    RELEASE_ASSERT(Options::useDollarVM());
    19112069    VM& vm = exec->vm();
    19122070    JSLockHolder lock(vm);
    … …  
    19212079static EncodedJSValue JSC_HOST_CALL functionGetElement(ExecState* exec)
    19222080{
     2081    RELEASE_ASSERT(Options::useDollarVM());
    19232082    VM& vm = exec->vm();
    19242083    JSLockHolder lock(vm);
    … …  
    19322091static EncodedJSValue JSC_HOST_CALL functionCreateSimpleObject(ExecState* exec)
    19332092{
     2093    RELEASE_ASSERT(Options::useDollarVM());
    19342094    VM& vm = exec->vm();
    19352095    JSLockHolder lock(vm);
    … …  
    19392099static EncodedJSValue JSC_HOST_CALL functionGetHiddenValue(ExecState* exec)
    19402100{
     2101    RELEASE_ASSERT(Options::useDollarVM());
    19412102    VM& vm = exec->vm();
    19422103    JSLockHolder lock(vm);
    … …  
    19532114static EncodedJSValue JSC_HOST_CALL functionSetHiddenValue(ExecState* exec)
    19542115{
     2116    RELEASE_ASSERT(Options::useDollarVM());
    19552117    VM& vm = exec->vm();
    19562118    JSLockHolder lock(vm);
    … …  
    19692131static EncodedJSValue JSC_HOST_CALL functionShadowChickenFunctionsOnStack(ExecState* exec)
    19702132{
     2133    RELEASE_ASSERT(Options::useDollarVM());
    19712134    VM& vm = exec->vm();
    19722135    auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    19932156static EncodedJSValue JSC_HOST_CALL functionSetGlobalConstRedeclarationShouldNotThrow(ExecState* exec)
    19942157{
     2158    RELEASE_ASSERT(Options::useDollarVM());
    19952159    VM& vm = exec->vm();
    19962160    vm.setGlobalConstRedeclarationShouldThrow(false);
    … …  
    20002164static EncodedJSValue JSC_HOST_CALL functionFindTypeForExpression(ExecState* exec)
    20012165{
     2166    RELEASE_ASSERT(Options::useDollarVM());
    20022167    VM& vm = exec->vm();
    20032168    RELEASE_ASSERT(vm.typeProfiler());
    … …  
    20192184static EncodedJSValue JSC_HOST_CALL functionReturnTypeFor(ExecState* exec)
    20202185{
     2186    RELEASE_ASSERT(Options::useDollarVM());
    20212187    VM& vm = exec->vm();
    20222188    RELEASE_ASSERT(vm.typeProfiler());
    … …  
    20342200static EncodedJSValue JSC_HOST_CALL functionFlattenDictionaryObject(ExecState* exec)
    20352201{
     2202    RELEASE_ASSERT(Options::useDollarVM());
    20362203    VM& vm = exec->vm();
    20372204    JSValue value = exec->argument(0);
    … …  
    20432210static EncodedJSValue JSC_HOST_CALL functionDumpBasicBlockExecutionRanges(ExecState* exec)
    20442211{
     2212    RELEASE_ASSERT(Options::useDollarVM());
    20452213    VM& vm = exec->vm();
    20462214    RELEASE_ASSERT(vm.controlFlowProfiler());
    … …  
    20512219static EncodedJSValue JSC_HOST_CALL functionHasBasicBlockExecuted(ExecState* exec)
    20522220{
     2221    RELEASE_ASSERT(Options::useDollarVM());
    20532222    VM& vm = exec->vm();
    20542223    RELEASE_ASSERT(vm.controlFlowProfiler());
    … …  
    20702239static EncodedJSValue JSC_HOST_CALL functionBasicBlockExecutionCount(ExecState* exec)
    20712240{
     2241    RELEASE_ASSERT(Options::useDollarVM());
    20722242    VM& vm = exec->vm();
    20732243    RELEASE_ASSERT(vm.controlFlowProfiler());
    … …  
    20892259static EncodedJSValue JSC_HOST_CALL functionEnableExceptionFuzz(ExecState*)
    20902260{
     2261    RELEASE_ASSERT(Options::useDollarVM());
    20912262    Options::useExceptionFuzz() = true;
    20922263    return JSValue::encode(jsUndefined());
    20932264}
    20942265
     2266class DoNothingDebugger final : public Debugger {
     2267    WTF_MAKE_NONCOPYABLE(DoNothingDebugger);
     2268    WTF_MAKE_FAST_ALLOCATED;
     2269public:
     2270    DoNothingDebugger(VM& vm)
     2271        : Debugger(vm)
     2272    {
     2273        RELEASE_ASSERT(Options::useDollarVM());
     2274        setSuppressAllPauses(true);
     2275    }
     2276
     2277private:
     2278    void sourceParsed(ExecState*, SourceProvider*, int, const WTF::String&) override
     2279    {
     2280        RELEASE_ASSERT(Options::useDollarVM());
     2281    }
     2282};
     2283
    20952284static EncodedJSValue changeDebuggerModeWhenIdle(ExecState* exec, OptionSet<CodeGenerationMode> codeGenerationMode)
    20962285{
    2097     bool newDebuggerMode = codeGenerationMode.contains(CodeGenerationMode::Debugger);
    2098     if (Options::forceDebuggerBytecodeGeneration() == newDebuggerMode)
     2286    RELEASE_ASSERT(Options::useDollarVM());
     2287    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
     2288
     2289    bool debuggerRequested = codeGenerationMode.contains(CodeGenerationMode::Debugger);
     2290    if (debuggerRequested == globalObject->hasDebugger())
    20992291        return JSValue::encode(jsUndefined());
    21002292
    21012293    VM* vm = &exec->vm();
    21022294    vm->whenIdle([=] () {
    2103         Options::forceDebuggerBytecodeGeneration() = newDebuggerMode;
    2104         vm->deleteAllCode(PreventCollectionAndDeleteAllCode);
    2105         if (newDebuggerMode)
    2106             vm->ensureShadowChicken();
     2295        if (debuggerRequested) {
     2296            Debugger* debugger = new DoNothingDebugger(globalObject->vm());
     2297            globalObject->setDebugger(debugger);
     2298            debugger->activateBreakpoints(); // Also deletes all code.
     2299        } else {
     2300            Debugger* debugger = globalObject->debugger();
     2301            debugger->deactivateBreakpoints(); // Also deletes all code.
     2302            globalObject->setDebugger(nullptr);
     2303            delete debugger;
     2304        }
    21072305    });
    21082306    return JSValue::encode(jsUndefined());
    … …  
    21112309static EncodedJSValue JSC_HOST_CALL functionEnableDebuggerModeWhenIdle(ExecState* exec)
    21122310{
     2311    RELEASE_ASSERT(Options::useDollarVM());
    21132312    return changeDebuggerModeWhenIdle(exec, { CodeGenerationMode::Debugger });
    21142313}
    … …  
    21162315static EncodedJSValue JSC_HOST_CALL functionDisableDebuggerModeWhenIdle(ExecState* exec)
    21172316{
     2317    RELEASE_ASSERT(Options::useDollarVM());
    21182318    return changeDebuggerModeWhenIdle(exec, { });
    21192319}
    … …  
    21212321static EncodedJSValue JSC_HOST_CALL functionDeleteAllCodeWhenIdle(ExecState* exec)
    21222322{
     2323    RELEASE_ASSERT(Options::useDollarVM());
    21232324    VM* vm = &exec->vm();
    21242325    vm->whenIdle([=] () {
    … …  
    21302331static EncodedJSValue JSC_HOST_CALL functionGlobalObjectCount(ExecState* exec)
    21312332{
     2333    RELEASE_ASSERT(Options::useDollarVM());
    21322334    return JSValue::encode(jsNumber(exec->vm().heap.globalObjectCount()));
    21332335}
    … …  
    21352337static EncodedJSValue JSC_HOST_CALL functionGlobalObjectForObject(ExecState* exec)
    21362338{
     2339    RELEASE_ASSERT(Options::useDollarVM());
    21372340    JSValue value = exec->argument(0);
    21382341    RELEASE_ASSERT(value.isObject());
    … …  
    21442347static EncodedJSValue JSC_HOST_CALL functionGetGetterSetter(ExecState* exec)
    21452348{
     2349    RELEASE_ASSERT(Options::useDollarVM());
    21462350    VM& vm = exec->vm();
    21472351    auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    21732377static EncodedJSValue JSC_HOST_CALL functionLoadGetterFromGetterSetter(ExecState* exec)
    21742378{
     2379    RELEASE_ASSERT(Options::useDollarVM());
    21752380    VM& vm = exec->vm();
    21762381    auto scope = DECLARE_THROW_SCOPE(vm);
    … …  
    21892394static EncodedJSValue JSC_HOST_CALL functionCreateCustomTestGetterSetter(ExecState* exec)
    21902395{
     2396    RELEASE_ASSERT(Options::useDollarVM());
    21912397    VM& vm = exec->vm();
    21922398    JSGlobalObject* globalObject = exec->lexicalGlobalObject();
    … …  
    21962402static EncodedJSValue JSC_HOST_CALL functionDeltaBetweenButterflies(ExecState* exec)
    21972403{
     2404    RELEASE_ASSERT(Options::useDollarVM());
    21982405    VM& vm = exec->vm();
    21992406    JSObject* a = jsDynamicCast<JSObject*>(vm, exec->argument(0));
    … …  
    22122419static EncodedJSValue JSC_HOST_CALL functionTotalGCTime(ExecState* exec)
    22132420{
     2421    RELEASE_ASSERT(Options::useDollarVM());
    22142422    VM& vm = exec->vm();
    22152423    return JSValue::encode(jsNumber(vm.heap.totalGCTime().seconds()));
    … …  
    22182426static EncodedJSValue JSC_HOST_CALL functionParseCount(ExecState*)
    22192427{
     2428    RELEASE_ASSERT(Options::useDollarVM());
    22202429    return JSValue::encode(jsNumber(globalParseCount.load()));
    22212430}
    … …  
    22232432static EncodedJSValue JSC_HOST_CALL functionIsWasmSupported(ExecState*)
    22242433{
     2434    RELEASE_ASSERT(Options::useDollarVM());
    22252435#if ENABLE(WEBASSEMBLY)
    22262436    return JSValue::encode(jsBoolean(Wasm::isSupported()));
    … …  
    22322442void JSDollarVM::finishCreation(VM& vm)
    22332443{
     2444    RELEASE_ASSERT(Options::useDollarVM());
    22342445    Base::finishCreation(vm);
    22352446
    … …  
    23522563void JSDollarVM::addFunction(VM& vm, JSGlobalObject* globalObject, const char* name, NativeFunction function, unsigned arguments)
    23532564{
     2565    RELEASE_ASSERT(Options::useDollarVM());
    23542566    Identifier identifier = Identifier::fromString(vm, name);
    23552567    putDirect(vm, identifier, JSFunction::create(vm, globalObject, arguments, identifier.string(), function));
    … …  
    23582570void JSDollarVM::addConstructibleFunction(VM& vm, JSGlobalObject* globalObject, const char* name, NativeFunction function, unsigned arguments)
    23592571{
     2572    RELEASE_ASSERT(Options::useDollarVM());
    23602573    Identifier identifier = Identifier::fromString(vm, name);
    23612574    putDirect(vm, identifier, JSFunction::create(vm, globalObject, arguments, identifier.string(), function, NoIntrinsic, function));

  • TabularUnified trunk/Source/JavaScriptCore/tools/JSDollarVM.h

    r229413 r249808  
    11/*
    2  * Copyright (C) 2015-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2727
    2828#include "JSObject.h"
     29#include "Options.h"
    2930
    3031namespace JSC {
    31    
     32
    3233class JSDollarVM final : public JSNonFinalObject {
    3334public:
    … …  
    3839    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
    3940    {
     41        RELEASE_ASSERT(Options::useDollarVM());
    4042        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());
    4143    }
    … …  
    4345    static JSDollarVM* create(VM& vm, Structure* structure)
    4446    {
     47        RELEASE_ASSERT(Options::useDollarVM());
    4548        JSDollarVM* instance = new (NotNull, allocateCell<JSDollarVM>(vm.heap)) JSDollarVM(vm, structure);
    4649        instance->finishCreation(vm);
    … …  
    5255        : Base(vm, structure)
    5356    {
     57        RELEASE_ASSERT(Options::useDollarVM());
    5458    }
     59
    5560
    5661    void finishCreation(VM&);

  • TabularUnified trunk/Source/WTF/ChangeLog

    r249681 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        Add a source file that was missing so that Xcode can search its contents too.
     10
     11        * WTF.xcodeproj/project.pbxproj:
     12
    1132019-09-09  Tim Horton  <timothy_horton@apple.com>
    214

  • TabularUnified trunk/Source/WTF/WTF.xcodeproj/project.pbxproj

    r249327 r249808  
    692692                FE1E2C392240C05400F6B729 /* PtrTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PtrTag.cpp; sourceTree = "<group>"; };
    693693                FE1E2C41224187C600F6B729 /* PlatformRegisters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlatformRegisters.cpp; sourceTree = "<group>"; };
     694                FE3842342325CC80009DD445 /* ResourceUsage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceUsage.h; sourceTree = "<group>"; };
    694695                FE7497E4208FFCAA0003565B /* PtrTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PtrTag.h; sourceTree = "<group>"; };
    695696                FE7497ED209163060003565B /* MetaAllocatorPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MetaAllocatorPtr.h; sourceTree = "<group>"; };
    … …  
    11161117                                86F46F5F1A2840EE00CCBF22 /* RefCounter.h */,
    11171118                                A8A47303151A825B004123FF /* RefPtr.h */,
     1119                                FE3842342325CC80009DD445 /* ResourceUsage.h */,
    11181120                                A8A47305151A825B004123FF /* RetainPtr.h */,
    11191121                                2CDED0F118115C85004DBA70 /* RunLoop.cpp */,

  • TabularUnified trunk/Source/WebCore/ChangeLog

    r249803 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        No new tests.  Covered by existing tests.
     10
     11        Enable Options::useDollarVM before we tell the JSGlobalObject to exposeDollarVM().
     12        The $vm utility is now hardened to require that Options::useDollarVM be
     13        enabled in order for it to be used.
     14
     15        * testing/js/WebCoreTestSupport.cpp:
     16        (WebCoreTestSupport::injectInternalsObject):
     17
    1182019-09-12  Youenn Fablet  <youenn@apple.com>
    219

  • TabularUnified trunk/Source/WebCore/testing/js/WebCoreTestSupport.cpp

    r249175 r249808  
    6464    if (is<Document>(*scriptContext)) {
    6565        globalObject->putDirect(vm, Identifier::fromString(vm, Internals::internalsId), toJS(exec, globalObject, Internals::create(downcast<Document>(*scriptContext))));
     66        Options::useDollarVM() = true;
    6667        globalObject->exposeDollarVM(vm);
    6768    }

  • TabularUnified trunk/Source/WebKit/ChangeLog

    r249806 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        Linux parts contributed by Carlos Garcia Campos <cgarcia@igalia.com>.
     10
     11        1. Add plumbing to allow WK2 tests to configureJSCForTesting().
     12        2. Removed the call enable Options::useBigInt in WebInspectorUI.
     13           WebInspectorUI doesn't really need it for now.
     14
     15        * PluginProcess/unix/PluginProcessMainUnix.cpp:
     16        * Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h:
     17        (WebKit::XPCServiceInitializer):
     18        * Shared/unix/AuxiliaryProcessMain.cpp:
     19        (WebKit::AuxiliaryProcessMainBase::parseCommandLine):
     20        * Shared/unix/AuxiliaryProcessMain.h:
     21        (WebKit::AuxiliaryProcessMain):
     22        * UIProcess/API/APIProcessPoolConfiguration.cpp:
     23        (API::ProcessPoolConfiguration::copy):
     24        * UIProcess/API/APIProcessPoolConfiguration.h:
     25        * UIProcess/API/C/WKContextConfigurationRef.cpp:
     26        (WKContextConfigurationSetShouldConfigureJSCForTesting):
     27        * UIProcess/API/C/WKContextConfigurationRef.h:
     28        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
     29        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
     30        (-[_WKProcessPoolConfiguration configureJSCForTesting]):
     31        (-[_WKProcessPoolConfiguration setConfigureJSCForTesting:]):
     32        * UIProcess/Launcher/ProcessLauncher.h:
     33        (WebKit::ProcessLauncher::Client::shouldConfigureJSCForTesting const):
     34        * UIProcess/Launcher/glib/ProcessLauncherGLib.cpp:
     35        (WebKit::ProcessLauncher::launchProcess):
     36        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
     37        (WebKit::ProcessLauncher::launchProcess):
     38        * UIProcess/WebProcessProxy.cpp:
     39        (WebKit::WebProcessProxy::shouldConfigureJSCForTesting const):
     40        * UIProcess/WebProcessProxy.h:
     41        * WebProcess/WebPage/WebInspectorUI.cpp:
     42        (WebKit::WebInspectorUI::WebInspectorUI):
     43
    1442019-09-12  Michael Catanzaro  <mcatanzaro@igalia.com>
    245

  • TabularUnified trunk/Source/WebKit/PluginProcess/unix/PluginProcessMainUnix.cpp

    r240683 r249808  
    7474            ASSERT(argc == 3);
    7575#if PLUGIN_ARCHITECTURE(UNIX)
     76            InitializeWebKit2();
    7677            exit(NetscapePluginModule::scanPlugin(argv[2]) ? EXIT_SUCCESS : EXIT_FAILURE);
    7778#else

  • TabularUnified trunk/Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.h

    r242303 r249808  
    11/*
    2  * Copyright (C) 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2013-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    7777void XPCServiceInitializer(OSObjectPtr<xpc_connection_t> connection, xpc_object_t initializerMessage, xpc_object_t priorityBoostMessage)
    7878{
    79     if (initializerMessage && xpc_dictionary_get_bool(initializerMessage, "disable-jit"))
    80         JSC::ExecutableAllocator::setJITEnabled(false);
     79    if (initializerMessage) {
     80        if (xpc_dictionary_get_bool(initializerMessage, "configure-jsc-for-testing"))
     81            JSC::Config::configureForTesting();
     82        if (xpc_dictionary_get_bool(initializerMessage, "disable-jit"))
     83            JSC::ExecutableAllocator::setJITEnabled(false);
     84    }
    8185
    8286    XPCServiceInitializerDelegateType delegate(WTFMove(connection), initializerMessage);

  • TabularUnified trunk/Source/WebKit/Shared/unix/AuxiliaryProcessMain.cpp

    r240683 r249808  
    2727#include "AuxiliaryProcessMain.h"
    2828
     29#include <JavaScriptCore/Options.h>
    2930#include <WebCore/ProcessIdentifier.h>
    3031#include <stdlib.h>
     32#include <string.h>
    3133
    3234namespace WebKit {
    … …  
    4042    m_parameters.processIdentifier = makeObjectIdentifier<WebCore::ProcessIdentifierType>(atoll(argv[1]));
    4143    m_parameters.connectionIdentifier = atoi(argv[2]);
     44#if ENABLE(DEVELOPER_MODE)
     45    if (argc > 3 && !strcmp(argv[3], "--configure-jsc-for-testing"))
     46        JSC::Config::configureForTesting();
     47#endif
    4248    return true;
    4349}

  • TabularUnified trunk/Source/WebKit/Shared/unix/AuxiliaryProcessMain.h

    r240683 r249808  
    5858        return EXIT_FAILURE;
    5959
    60     InitializeWebKit2();
    61 
    6260    if (!auxiliaryMain.parseCommandLine(argc, argv))
    6361        return EXIT_FAILURE;
     62
     63    InitializeWebKit2();
    6464
    6565    initializeAuxiliaryProcess<AuxiliaryProcessType>(auxiliaryMain.takeInitializationParameters());

  • TabularUnified trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

    r249778 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    101101    copy->m_shouldCaptureAudioInUIProcess = this->m_shouldCaptureAudioInUIProcess;
    102102    copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess;
     103    copy->m_shouldConfigureJSCForTesting = this->m_shouldConfigureJSCForTesting;
    103104    copy->m_isJITEnabled = this->m_isJITEnabled;
    104105    copy->m_downloadMonitorSpeedMultiplier = this->m_downloadMonitorSpeedMultiplier;

  • TabularUnified trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r249778 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    148148    void setShouldCaptureDisplayInUIProcess(bool shouldCaptureDisplayInUIProcess) { m_shouldCaptureDisplayInUIProcess = shouldCaptureDisplayInUIProcess; }
    149149
     150    bool shouldConfigureJSCForTesting() const { return m_shouldConfigureJSCForTesting; }
     151    void setShouldConfigureJSCForTesting(bool value) { m_shouldConfigureJSCForTesting = value; }
    150152    bool isJITEnabled() const { return m_isJITEnabled; }
    151153    void setJITEnabled(bool enabled) { m_isJITEnabled = enabled; }
    … …  
    219221    bool m_clientWouldBenefitFromAutomaticProcessPrewarming { false };
    220222    WTF::String m_customWebContentServiceBundleIdentifier;
     223    bool m_shouldConfigureJSCForTesting { false };
    221224    bool m_isJITEnabled { true };
    222225    bool m_usesSingleWebProcess { false };

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp

    r249622 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    215215}
    216216
     217void WKContextConfigurationSetShouldConfigureJSCForTesting(WKContextConfigurationRef configuration, bool value)
     218{
     219    toImpl(configuration)->setShouldConfigureJSCForTesting(value);
     220}

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h

    r249622 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    9191WK_EXPORT void WKContextConfigurationSetDiskCacheSizeOverride(WKContextConfigurationRef configuration, int64_t size) WK_C_API_DEPRECATED;
    9292   
     93WK_EXPORT void WKContextConfigurationSetShouldConfigureJSCForTesting(WKContextConfigurationRef configuration, bool value);
     94
    9395#ifdef __cplusplus
    9496}

  • TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h

    r247759 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    7373@property (nonatomic, nullable, copy, setter=setHSTSStorageDirectory:) NSURL *hstsStorageDirectory WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    7474
     75@property (nonatomic) BOOL configureJSCForTesting WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
     76
    7577@end
    7678

  • TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm

    r247759 r249808  
    11/*
    2  * Copyright (C) 2014 Apple Inc. All rights reserved.
     2 * Copyright (C) 2014-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    410410}
    411411
     412- (BOOL)configureJSCForTesting
     413{
     414    return _processPoolConfiguration->shouldConfigureJSCForTesting();
     415}
     416
     417- (void)setConfigureJSCForTesting:(BOOL)value
     418{
     419    _processPoolConfiguration->setShouldConfigureJSCForTesting(value);
     420}
     421
    412422#pragma mark WKObject protocol implementation
    413423

  • TabularUnified trunk/Source/WebKit/UIProcess/Launcher/ProcessLauncher.h

    r249274 r249808  
    11/*
    2  * Copyright (C) 2010, 2012 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    5656       
    5757        virtual void didFinishLaunching(ProcessLauncher*, IPC::Connection::Identifier) = 0;
     58        virtual bool shouldConfigureJSCForTesting() const { return false; }
    5859        virtual bool isJITEnabled() const { return true; }
    5960    };

  • TabularUnified trunk/Source/WebKit/UIProcess/Launcher/glib/ProcessLauncherGLib.cpp

    r249569 r249808  
    114114        nargs += prefixArgs.size();
    115115    }
     116
     117    bool configureJSCForTesting = false;
     118    if (m_launchOptions.processType == ProcessLauncher::ProcessType::Web && m_client && m_client->shouldConfigureJSCForTesting()) {
     119        configureJSCForTesting = true;
     120        nargs++;
     121    }
    116122#endif
    117123
    … …  
    126132    argv[i++] = processIdentifier.get();
    127133    argv[i++] = webkitSocket.get();
     134#if ENABLE(DEVELOPER_MODE)
     135    if (configureJSCForTesting)
     136        argv[i++] = const_cast<char*>("--configure-jsc-for-testing");
     137#endif
    128138#if ENABLE(NETSCAPE_PLUGIN_API)
    129139    argv[i++] = const_cast<char*>(realPluginPath.data());

  • TabularUnified trunk/Source/WebKit/UIProcess/Launcher/mac/ProcessLauncherMac.mm

    r245562 r249808  
    11/*
    2  * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    175175    auto bootstrapMessage = adoptOSObject(xpc_dictionary_create(nullptr, nullptr, 0));
    176176   
    177     if (m_client && !m_client->isJITEnabled())
    178         xpc_dictionary_set_bool(bootstrapMessage.get(), "disable-jit", true);
     177    if (m_client) {
     178        if (m_client->shouldConfigureJSCForTesting())
     179            xpc_dictionary_set_bool(bootstrapMessage.get(), "configure-jsc-for-testing", true);
     180        if (!m_client->isJITEnabled())
     181            xpc_dictionary_set_bool(bootstrapMessage.get(), "disable-jit", true);
     182    }
    179183
    180184    xpc_dictionary_set_string(bootstrapMessage.get(), "message-name", "bootstrap");

  • TabularUnified trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

    r249801 r249808  
    11/*
    2  * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    13141314}
    13151315
     1316bool WebProcessProxy::shouldConfigureJSCForTesting() const
     1317{
     1318    return processPool().configuration().shouldConfigureJSCForTesting();
     1319}
     1320
    13161321bool WebProcessProxy::isJITEnabled() const
    13171322{

  • TabularUnified trunk/Source/WebKit/UIProcess/WebProcessProxy.h

    r249801 r249808  
    11/*
    2  * Copyright (C) 2010-2017 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    336336#endif
    337337
     338    bool shouldConfigureJSCForTesting() const final;
    338339    bool isJITEnabled() const final;
    339340

  • TabularUnified trunk/Source/WebKit/WebProcess/WebPage/WebInspectorUI.cpp

    r249329 r249808  
    5252    , m_frontendAPIDispatcher(page)
    5353{
    54     JSC::Options::useBigInt() = true;
    55        
    5654    RuntimeEnabledFeatures::sharedFeatures().setInspectorAdditionsEnabled(true);
    5755    RuntimeEnabledFeatures::sharedFeatures().setImageBitmapOffscreenCanvasEnabled(true);

  • TabularUnified trunk/Tools/ChangeLog

    r249807 r249808  
     12019-09-12  Mark Lam  <mark.lam@apple.com>
     2
     3        Harden JSC against the abuse of runtime options.
     4        https://bugs.webkit.org/show_bug.cgi?id=201597
     5        <rdar://problem/55167068>
     6
     7        Reviewed by Filip Pizlo.
     8
     9        Linux parts contributed by Carlos Garcia Campos <cgarcia@igalia.com>.
     10        Windows parts contributed by Fujii Hironori <Hironori.Fujii@sony.com>.
     11
     12        Call JSC::Config::configureForTesting() in test harnesses or at the top of tests
     13        to disable the hardening on test runs.  Tests rely on setting options to enable
     14        test features.
     15
     16        * DumpRenderTree/mac/DumpRenderTree.mm:
     17        (dumpRenderTree):
     18        * DumpRenderTree/win/DumpRenderTree.cpp:
     19        (initialize):
     20        * TestWebKitAPI/PlatformUtilities.cpp:
     21        (TestWebKitAPI::Util::createContextWithInjectedBundle):
     22        * TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp:
     23        (main):
     24        * TestWebKitAPI/Tests/WebKitCocoa/ApplePay.mm:
     25        (TestWebKitAPI::TEST):
     26        (TestWebKitAPI::runActiveSessionTest):
     27        * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDiagnosticLogging.mm:
     28        (TEST):
     29        * TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm:
     30        (TEST):
     31        * TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm:
     32        (TestWebKitAPI::TEST):
     33        * TestWebKitAPI/WKWebViewConfigurationExtras.h:
     34        * TestWebKitAPI/WKWebViewConfigurationExtras.mm:
     35        (+[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:]):
     36        (+[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:configureJSCForTesting:]):
     37        * WebKitTestRunner/TestController.cpp:
     38        (WTR::TestController::generateContextConfiguration const):
     39
    1402019-09-12  Keith Rollin  <krollin@apple.com>
    241

  • TabularUnified trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r249629 r249808  
    5858#import "WorkQueueItem.h"
    5959#import <CoreFoundation/CoreFoundation.h>
     60#import <JavaScriptCore/JSCConfig.h>
    6061#import <JavaScriptCore/Options.h>
    6162#import <JavaScriptCore/TestRunnerUtils.h>
    … …  
    12841285void dumpRenderTree(int argc, const char *argv[])
    12851286{
     1287    JSC::Config::configureForTesting();
     1288
    12861289#if PLATFORM(IOS_FAMILY)
    12871290    setUpIOSLayoutTestCommunication();

  • TabularUnified trunk/Tools/DumpRenderTree/win/DumpRenderTree.cpp

    r249746 r249808  
    315315static void initialize()
    316316{
     317    JSC::Config::configureForTesting();
     318
    317319    if (HMODULE webKitModule = LoadLibrary(WEBKITDLL))
    318320        if (FARPROC dllRegisterServer = GetProcAddress(webKitModule, "DllRegisterServer"))

  • TabularUnified trunk/Tools/TestWebKitAPI/PlatformUtilities.cpp

    r248846 r249808  
    11/*
    2  * Copyright (C) 2010 Apple Inc. All rights reserved.
     2 * Copyright (C) 2010-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4141    auto configuration = adoptWK(WKContextConfigurationCreate());
    4242    WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath.get());
     43    WKContextConfigurationSetShouldConfigureJSCForTesting(configuration.get(), true);
    4344    return WKContextCreateWithConfiguration(configuration.get());
    4445}

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/JavaScriptCore/glib/TestJSC.cpp

    r243289 r249808  
    37423742    g_test_init(&argc, &argv, nullptr);
    37433743
     3744    // options should always be the first test, since changing options
     3745    // is not allowed after the first VM instance is created.
     3746    g_test_add_func("/jsc/options", testsJSCOptions);
    37443747    g_test_add_func("/jsc/basic", testJSCBasic);
    37453748    g_test_add_func("/jsc/types", testJSCTypes);
    … …  
    37563759    g_test_add_func("/jsc/weak-value", testJSCWeakValue);
    37573760    g_test_add_func("/jsc/vm", testsJSCVirtualMachine);
    3758     g_test_add_func("/jsc/options", testsJSCOptions);
    37593761#ifdef G_DEFINE_AUTOPTR_CLEANUP_FUNC
    37603762    g_test_add_func("/jsc/autocleanups", testsJSCAutocleanups);

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/ApplePay.mm

    r246056 r249808  
    9595    auto messageHandler = adoptNS([[TestApplePayAvailableScriptMessageHandler alloc] initWithAPIsAvailableExpectation:YES canMakePaymentsExpectation:YES]);
    9696
    97     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     97    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    9898    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    9999
    … …  
    113113    auto userScript = adoptNS([[WKUserScript alloc] initWithSource:userScriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]);
    114114
    115     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     115    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    116116    [configuration.userContentController addUserScript:userScript.get()];
    117117    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    … …  
    136136    auto userScript = adoptNS([[WKUserScript alloc] initWithSource:userScriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]);
    137137
    138     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     138    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    139139    [configuration.userContentController addUserScript:userScript.get()];
    140140    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    … …  
    157157    auto userScript = adoptNS([[WKUserScript alloc] initWithSource:userScriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES]);
    158158   
    159     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     159    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    160160    [configuration.userContentController addUserScript:userScript.get()];
    161161    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    … …  
    177177    auto messageHandler = adoptNS([[TestApplePayAvailableScriptMessageHandler alloc] initWithAPIsAvailableExpectation:YES canMakePaymentsExpectation:NO]);
    178178
    179     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     179    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    180180    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    181181
    … …  
    198198    auto messageHandler = adoptNS([[TestApplePayAvailableScriptMessageHandler alloc] initWithAPIsAvailableExpectation:YES canMakePaymentsExpectation:NO]);
    199199
    200     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     200    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    201201    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    202202
    … …  
    222222    auto userScript = adoptNS([[WKUserScript alloc] initWithSource:userScriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentStart forMainFrameOnly:YES]);
    223223
    224     WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"];
     224    WKWebViewConfiguration *configuration = [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES];
    225225    [configuration.userContentController addScriptMessageHandler:messageHandler.get() name:@"testApplePay"];
    226226

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDiagnosticLogging.mm

    r244307 r249808  
    8888TEST(WKWebView, DiagnosticLoggingDictionary)
    8989{
    90     auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals"]]);
     90    auto webView = adoptNS([[WKWebView alloc] initWithFrame:CGRectZero configuration:[WKWebViewConfiguration _test_configurationWithTestPlugInClassName:@"WebProcessPlugInWithInternals" configureJSCForTesting:YES]]);
    9191    auto testLoggingDelegate = adoptNS([TestLoggingDelegate new]);
    9292    [webView _setDiagnosticLoggingDelegate:testLoggingDelegate.get()];

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebsiteDataStoreCustomPaths.mm

    r248697 r249808  
    3131#import "TestNavigationDelegate.h"
    3232#import "TestWKWebView.h"
     33#import <JavaScriptCore/JSCConfig.h>
    3334#import <WebKit/WKPreferencesRef.h>
    3435#import <WebKit/WKProcessPoolPrivate.h>
    … …  
    618619TEST(WebKit, MediaCache)
    619620{
     621    JSC::Config::configureForTesting();
     622
    620623    std::atomic<bool> done = false;
    621624    using namespace TestWebKitAPI;

  • TabularUnified trunk/Tools/TestWebKitAPI/Tests/mac/MediaPlaybackSleepAssertion.mm

    r249327 r249808  
    3232#import <Carbon/Carbon.h>
    3333#import <IOKit/pwr_mgt/IOPMLib.h>
     34#import <JavaScriptCore/JSCConfig.h>
    3435#import <JavaScriptCore/JSContext.h>
    3536#import <WebCore/Settings.h>
    … …  
    143144TEST(WebKitLegacy, MediaPlaybackSleepAssertion)
    144145{
     146    JSC::Config::configureForTesting();
     147
    145148    didFinishLoad = false;
    146149    didBeginPlaying = false;

  • TabularUnified trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.h

    r242339 r249808  
    11/*
    2  * Copyright (C) 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2828@interface WKWebViewConfiguration (TestWebKitAPIExtras)
    2929+ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className;
     30+ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className configureJSCForTesting:(BOOL)value;
    3031@end

  • TabularUnified trunk/Tools/TestWebKitAPI/WKWebViewConfigurationExtras.mm

    r242339 r249808  
    11/*
    2  * Copyright (C) 2015 Apple Inc. All rights reserved.
     2 * Copyright (C) 2015-2019 Apple Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    3636+ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className
    3737{
     38    return [WKWebViewConfiguration _test_configurationWithTestPlugInClassName:className configureJSCForTesting:NO];
     39}
     40
     41+ (instancetype)_test_configurationWithTestPlugInClassName:(NSString *)className configureJSCForTesting:(BOOL)value
     42{
    3843    auto processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
    3944    [processPoolConfiguration setInjectedBundleURL:[[NSBundle mainBundle] URLForResource:@"TestWebKitAPI" withExtension:@"wkbundle"]];
     45    [processPoolConfiguration setConfigureJSCForTesting:value];
    4046
    4147    auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);

  • TabularUnified trunk/Tools/WebKitTestRunner/TestController.cpp

    r249675 r249808  
    504504    }
    505505
     506    WKContextConfigurationSetShouldConfigureJSCForTesting(configuration.get(), true);
     507
    506508    return configuration;
    507509}
Note: See TracChangeset for help on using the changeset viewer.