Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 04:15:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1358135 part 2 - Preserve a Zone's JIT code also when it has Baseline code on the stack. r=bhackett

Browse Source
This commit is contained in:
Jan de Mooij 2017-06-03 17:30:02 +02:00
parent d2c775856a
commit 53b79d09c3
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit-test/tests/self-test/inIon.js
View File

@ -13,7 +13,7 @@ function test() {
while(!callInIon());
// Test with zealous gc preventing compilation.
while(!inIon()) gc();
while(!inIon()) gc(this, 'shrinking');
};
test();

15
js/src/jit/JitFrames.cpp
View File

@ -1532,19 +1532,8 @@ TraceJitActivations(JSContext* cx, const CooperatingContext& target, JSTracer* t
TraceJitActivation(trc, activations);
}
JSCompartment*
TopmostIonActivationCompartment(JSContext* cx)
{
for (JitActivationIterator activations(cx); !activations.done(); ++activations) {
for (JitFrameIterator frames(activations); !frames.done(); ++frames) {
if (frames.type() == JitFrame_IonJS)
return activations.activation()->compartment();
}
}
return nullptr;
}
void UpdateJitActivationsForMinorGC(JSRuntime* rt, JSTracer* trc)
void
UpdateJitActivationsForMinorGC(JSRuntime* rt, JSTracer* trc)
{
MOZ_ASSERT(JS::CurrentThreadIsHeapMinorCollecting());
JSContext* cx = TlsContext.get();

3
js/src/jit/JitFrames.h
View File

@ -287,9 +287,6 @@ void EnsureBareExitFrame(JSContext* cx, JitFrameLayout* frame);
void TraceJitActivations(JSContext* cx, const CooperatingContext& target, JSTracer* trc);
JSCompartment*
TopmostIonActivationCompartment(JSContext* cx);
void UpdateJitActivationsForMinorGC(JSRuntime* rt, JSTracer* trc);
static inline uint32_t

5
js/src/jsgc.cpp
View File

@ -3850,8 +3850,9 @@ GCRuntime::beginMarkPhase(JS::gcreason::Reason reason, AutoLockForExclusiveAcces
}
if (!rt->gc.cleanUpEverything && canAllocateMoreCode) {
if (JSCompartment* comp = jit::TopmostIonActivationCompartment(TlsContext.get()))
comp->zone()->setPreservingCode(true);
jit::JitActivationIterator activation(TlsContext.get());
if (!activation.done())
activation->compartment()->zone()->setPreservingCode(true);
}
/*