Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 08:42:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1436983 - Don't GC while linking JIT code r=nbp

Browse Source 
--HG--
extra : rebase_source : b096346182b263753414e1ef7aa4cb86d57d7386
This commit is contained in:
Jon Coppeard 2018-02-12 10:34:21 +00:00
parent 910fc98873
commit 7721a472b2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/jit-test/tests/ion/getprop-primitive.js
View File

@ -35,7 +35,8 @@ var template = function (set) {
// If we bailout in the inner loop, then x will have a smaller value
// than the number of iterations.
cont = assertEqIf(lastX > 0, x, set.length);
lastX = x;
if (inIon())
lastX = x;
x = 0;
}
return y;

7
js/src/jit/CodeGenerator.cpp
View File

@ -9838,6 +9838,11 @@ CodeGenerator::linkSharedStubs(JSContext* cx)
bool
CodeGenerator::link(JSContext* cx, CompilerConstraintList* constraints)
{
// We cancel off-thread Ion compilations in a few places during GC, but if
// this compilation was performed off-thread it will already have been
// removed from the relevant lists by this point. Don't allow GC here.
JS::AutoAssertNoGC nogc(cx);
RootedScript script(cx, gen->info().script());
OptimizationLevel optimizationLevel = gen->optimizationInfo().level();
@ -9918,7 +9923,7 @@ CodeGenerator::link(JSContext* cx, CompilerConstraintList* constraints)
// read barriers which were skipped while compiling the script off thread.
Linker linker(masm);
AutoFlushICache afc("IonLink");
JitCode* code = linker.newCode<CanGC>(cx, ION_CODE, !patchableBackedges_.empty());
JitCode* code = linker.newCode<NoGC>(cx, ION_CODE, !patchableBackedges_.empty());
if (!code)
return false;