diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-12-15 15:09:30 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-12-15 15:09:30 +0000 |
| commit | dabdec3b3ae9cd920e9fe75622a10ce290552941 (patch) | |
| tree | 4d462fe7a5f314369f373f6a42214bc9c0efbfcb /js/src | |
| parent | 5165ed02285315cc0bed7977c7bac6d0a90ca43c (diff) | |
| parent | cd17592001225e2d988c3aca9bd700de3c8ce4a3 (diff) | |
| download | UXP-RC_20201215.tar UXP-RC_20201215.tar.gz UXP-RC_20201215.tar.lz UXP-RC_20201215.tar.xz UXP-RC_20201215.zip | |
Merge branch 'redwood' into releaseRC_20201215
Diffstat (limited to 'js/src')
| -rw-r--r-- | js/src/jsapi.cpp | 3 | ||||
| -rw-r--r-- | js/src/jsapi.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index cd370e42c..3c1dbfb91 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -6608,6 +6608,9 @@ JS_SetGlobalJitCompilerOption(JSContext* cx, JSJitCompilerOption opt, uint32_t v case JSJITCOMPILER_ION_INTERRUPT_WITHOUT_SIGNAL: jit::JitOptions.ionInterruptWithoutSignals = !!value; break; + case JSJITCOMPILER_ION_INLINING: + jit::JitOptions.disableInlining = !value; + break; default: break; } diff --git a/js/src/jsapi.h b/js/src/jsapi.h index 5cdfd958e..2c221dbe4 100644 --- a/js/src/jsapi.h +++ b/js/src/jsapi.h @@ -5906,6 +5906,7 @@ JS_SetOffthreadIonCompilationEnabled(JSContext* cx, bool enabled); Register(ION_GVN_ENABLE, "ion.gvn.enable") \ Register(ION_FORCE_IC, "ion.forceinlineCaches") \ Register(ION_ENABLE, "ion.enable") \ + Register(ION_INLINING, "ion.inlining") \ Register(ION_INTERRUPT_WITHOUT_SIGNAL, "ion.interrupt-without-signals") \ Register(ION_CHECK_RANGE_ANALYSIS, "ion.check-range-analysis") \ Register(BASELINE_ENABLE, "baseline.enable") \ |