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

Bug 1351102 - Fix GetFinishedBuilder to check the runtime instead of the compartment. r=h4writer

Browse Source
This commit is contained in:
Jan de Mooij 2017-03-29 10:22:27 +02:00
parent 76239ccf41
commit 7d7a4a6d3e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/src/jit/Ion.cpp
View File

@ -2068,13 +2068,13 @@ CompileBackEnd(MIRGenerator* mir)
return GenerateCode(mir, lir);
}
// Find a finished builder for the compartment.
// Find a finished builder for the runtime.
static IonBuilder*
GetFinishedBuilder(JSContext* cx, GlobalHelperThreadState::IonBuilderVector& finished)
{
for (size_t i = 0; i < finished.length(); i++) {
IonBuilder* testBuilder = finished[i];
if (testBuilder->compartment == CompileCompartment::get(cx->compartment())) {
if (testBuilder->script()->runtimeFromAnyThread() == cx->runtime()) {
HelperThreadState().remove(finished, &i);
return testBuilder;
}
@ -2095,10 +2095,10 @@ AttachFinishedCompilations(JSContext* cx)
GlobalHelperThreadState::IonBuilderVector& finished = HelperThreadState().ionFinishedList(lock);
// Incorporate any off thread compilations for the compartment which have
// Incorporate any off thread compilations for the runtime which have
// finished, failed or have been cancelled.
while (true) {
// Find a finished builder for the compartment.
// Find a finished builder for the runtime.
IonBuilder* builder = GetFinishedBuilder(cx, finished);
if (!builder)
break;