Bug 1117768 - unified bustage followup on a CLOSED TREE

--HG--
extra : amend_source : c25ad4b2133fdaf6ef4429f2d875af7e0e5af5aa
This commit is contained in:
Steve Fink 2015-01-13 15:44:14 -08:00
Родитель dbad37981b
Коммит 2126630e3a
1 изменённых файлов: 4 добавлений и 3 удалений

Просмотреть файл

@ -61,6 +61,7 @@
#include "jit/arm/Simulator-arm.h"
#include "jit/Ion.h"
#include "js/Debug.h"
#include "js/GCAPI.h"
#include "js/StructuredClone.h"
#include "perf/jsperf.h"
#include "shell/jsheaptools.h"
@ -1670,8 +1671,8 @@ majorGC(JSRuntime *rt, JSGCStatus status, void *data)
if (info->depth > 0) {
info->depth--;
PrepareForFullGC(rt);
JS::GCForReason(rt, GC_NORMAL, gcreason::API);
JS::PrepareForFullGC(rt);
JS::GCForReason(rt, GC_NORMAL, JS::gcreason::API);
info->depth++;
}
}
@ -1690,7 +1691,7 @@ minorGC(JSRuntime *rt, JSGCStatus status, void *data)
if (info->active) {
info->active = false;
rt->gc.evictNursery(gcreason::DEBUG_GC);
rt->gc.evictNursery(JS::gcreason::DEBUG_GC);
info->active = true;
}
}