author | Benjamin Bouvier <benj@benj.me> |
Wed, 18 Apr 2018 12:14:54 +0200 | |
changeset 415643 | 417514d1ff3429cb266037937b330a9e0c9b641b |
parent 415642 | bf368c4e5c0a37074f5a74076ca5e4db4b1b0994 |
child 415644 | 8c74001d3808e8b385c60da11f6ca99053bd816b |
push id | 33901 |
push user | apavel@mozilla.com |
push date | Thu, 26 Apr 2018 06:05:37 +0000 |
treeherder | mozilla-central@b62ad926cf2a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nbp |
bugs | 1456881 |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
js/src/jit/Ion.cpp | file | annotate | diff | comparison | revisions | |
js/src/jit/Ion.h | file | annotate | diff | comparison | revisions |
--- a/js/src/jit/Ion.cpp +++ b/js/src/jit/Ion.cpp @@ -98,81 +98,45 @@ jit::GetJitContext() } JitContext* jit::MaybeGetJitContext() { return CurrentJitContext(); } -JitContext::JitContext(JSContext* cx, TempAllocator* temp) - : cx(cx), - temp(temp), - runtime(CompileRuntime::get(cx->runtime())), - compartment(CompileCompartment::get(cx->compartment())), - prev_(CurrentJitContext()), - assemblerCount_(0) -{ - SetJitContext(this); -} - JitContext::JitContext(CompileRuntime* rt, CompileCompartment* comp, TempAllocator* temp) : cx(nullptr), temp(temp), runtime(rt), compartment(comp), prev_(CurrentJitContext()), assemblerCount_(0) { SetJitContext(this); } -JitContext::JitContext(CompileRuntime* rt) - : cx(nullptr), - temp(nullptr), - runtime(rt), - compartment(nullptr), +JitContext::JitContext(JSContext* cx, TempAllocator* temp) + : cx(cx), + temp(temp), + runtime(CompileRuntime::get(cx->runtime())), + compartment(CompileCompartment::get(cx->compartment())), prev_(CurrentJitContext()), assemblerCount_(0) { SetJitContext(this); } JitContext::JitContext(TempAllocator* temp) - : cx(nullptr), - temp(temp), - runtime(nullptr), - compartment(nullptr), - prev_(CurrentJitContext()), - assemblerCount_(0) -{ - SetJitContext(this); -} - -JitContext::JitContext(CompileRuntime* rt, TempAllocator* temp) - : cx(nullptr), - temp(temp), - runtime(rt), - compartment(nullptr), - prev_(CurrentJitContext()), - assemblerCount_(0) -{ - SetJitContext(this); -} + : JitContext(nullptr, nullptr, temp) +{} JitContext::JitContext() - : cx(nullptr), - temp(nullptr), - runtime(nullptr), - compartment(nullptr), - prev_(CurrentJitContext()), - assemblerCount_(0) -{ - SetJitContext(this); -} + : JitContext(nullptr, nullptr, nullptr) +{} JitContext::~JitContext() { SetJitContext(prev_); } bool jit::InitializeIon()
--- a/js/src/jit/Ion.h +++ b/js/src/jit/Ion.h @@ -52,18 +52,16 @@ static_assert(sizeof(AbortReasonOr<bool> // JSContext, either of which may be nullptr, and the active compartment, which // will not be nullptr. class JitContext { public: JitContext(JSContext* cx, TempAllocator* temp); JitContext(CompileRuntime* rt, CompileCompartment* comp, TempAllocator* temp); - JitContext(CompileRuntime* rt, TempAllocator* temp); - explicit JitContext(CompileRuntime* rt); explicit JitContext(TempAllocator* temp); JitContext(); ~JitContext(); // Running context when executing on the main thread. Not available during // compilation. JSContext* cx;