summaryrefslogtreecommitdiffstats
path: root/js/xpconnect
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-15 15:09:30 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-15 15:09:30 +0000
commitdabdec3b3ae9cd920e9fe75622a10ce290552941 (patch)
tree4d462fe7a5f314369f373f6a42214bc9c0efbfcb /js/xpconnect
parent5165ed02285315cc0bed7977c7bac6d0a90ca43c (diff)
parentcd17592001225e2d988c3aca9bd700de3c8ce4a3 (diff)
downloadUXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.gz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.lz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.tar.xz
UXP-dabdec3b3ae9cd920e9fe75622a10ce290552941.zip
Merge branch 'redwood' into releaseRC_20201215
Diffstat (limited to 'js/xpconnect')
-rw-r--r--js/xpconnect/src/XPCJSContext.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/js/xpconnect/src/XPCJSContext.cpp b/js/xpconnect/src/XPCJSContext.cpp
index 511bc8a98..e941b8d75 100644
--- a/js/xpconnect/src/XPCJSContext.cpp
+++ b/js/xpconnect/src/XPCJSContext.cpp
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* vim: set ts=8 sts=4 et sw=4 tw=99: */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -1429,6 +1428,8 @@ ReloadPrefsCallback(const char* pref, void* data)
bool unboxedObjects = Preferences::GetBool(JS_OPTIONS_DOT_STR "unboxed_objects");
+ bool inlining = Preferences::GetBool(JS_OPTIONS_DOT_STR "ion.inlining");
+
sSharedMemoryEnabled = Preferences::GetBool(JS_OPTIONS_DOT_STR "shared_memory");
#ifdef DEBUG
@@ -1459,6 +1460,8 @@ ReloadPrefsCallback(const char* pref, void* data)
useIonEager ? 0 : -1);
JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_UNBOXED_OBJECTS,
unboxedObjects);
+ JS_SetGlobalJitCompilerOption(cx, JSJITCOMPILER_ION_INLINING,
+ inlining);
}
XPCJSContext::~XPCJSContext()