commit 7d292d774a3605673c912b2d3a248b95c6fabcb1 Author: Georg Koppen gk@torproject.org Date: Sat Sep 7 20:19:56 2019 +0000

Bug 31616: Fix JIT related crashes on aarch64

Patch by sysrqb. --- src/modules/security-prefs.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/security-prefs.js b/src/modules/security-prefs.js index fb465a05..a0a4ad4d 100644 --- a/src/modules/security-prefs.js +++ b/src/modules/security-prefs.js @@ -47,9 +47,11 @@ const kCustomPref = "extensions.torbutton.security_custom"; var write_setting_to_prefs = function (settingIndex) { Object.keys(kSecuritySettings).forEach( prefName => { - // Bug 31140 - Do not enable IonMonkey on AARCH64. + // Bug 31140 and 31616 - Do not enable JIT on aarch64. if (XPCOMABI.split("-")[0] == "aarch64" && - prefName == "javascript.options.ion") { + (prefName == "javascript.options.ion" || + prefName == "javascript.options.baselinejit" || + prefName == "javascript.options.native_regexp")) { setBoolPref(prefName, false); return; }