Bug 1123237 - Part 5. Don't emit inline allocation when memory profiler enabled. r=terrence

Based on patch from Ting-Yuan Huang <laszio.bugzilla@gmail.com>
This commit is contained in:
Kan-Ru Chen 2015-05-08 11:19:17 +08:00
Родитель 4d5b56d15f
Коммит 5c73000eba
1 изменённых файлов: 3 добавлений и 2 удалений

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

@ -1054,8 +1054,9 @@ MacroAssembler::checkUnboxedArrayCapacity(Register obj, const Int32Key& index, R
void
MacroAssembler::checkAllocatorState(Label* fail)
{
// Don't execute the inline path if we are tracing allocations.
if (js::gc::TraceEnabled())
// Don't execute the inline path if we are tracing allocations,
// or when the memory profiler is enabled.
if (js::gc::TraceEnabled() || MemProfiler::enabled())
jump(fail);
# ifdef JS_GC_ZEAL