diff options
Diffstat (limited to 'deps/v8/src/liveedit.cc')
| -rw-r--r-- | deps/v8/src/liveedit.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/deps/v8/src/liveedit.cc b/deps/v8/src/liveedit.cc index d44c2fc1cd..6107cbf0b4 100644 --- a/deps/v8/src/liveedit.cc +++ b/deps/v8/src/liveedit.cc @@ -1000,6 +1000,7 @@ class ReferenceCollectorVisitor : public ObjectVisitor { static void ReplaceCodeObject(Code* original, Code* substitution) { ASSERT(!HEAP->InNewSpace(substitution)); + HeapIterator iterator; AssertNoAllocation no_allocations_please; // A zone scope for ReferenceCollectorVisitor. @@ -1016,7 +1017,6 @@ static void ReplaceCodeObject(Code* original, Code* substitution) { // Now iterate over all pointers of all objects, including code_target // implicit pointers. - HeapIterator iterator; for (HeapObject* obj = iterator.next(); obj != NULL; obj = iterator.next()) { obj->Iterate(&visitor); } @@ -1101,6 +1101,8 @@ MaybeObject* LiveEdit::ReplaceFunctionCode( Handle<SharedFunctionInfo> shared_info = shared_info_wrapper.GetInfo(); + HEAP->EnsureHeapIsIterable(); + if (IsJSFunctionCode(shared_info->code())) { Handle<Code> code = compile_info_wrapper.GetFunctionCode(); ReplaceCodeObject(shared_info->code(), *code); @@ -1271,7 +1273,8 @@ class RelocInfoBuffer { // Patch positions in code (changes relocation info section) and possibly // returns new instance of code. -static Handle<Code> PatchPositionsInCode(Handle<Code> code, +static Handle<Code> PatchPositionsInCode( + Handle<Code> code, Handle<JSArray> position_change_array) { RelocInfoBuffer buffer_writer(code->relocation_size(), @@ -1286,7 +1289,7 @@ static Handle<Code> PatchPositionsInCode(Handle<Code> code, int new_position = TranslatePosition(position, position_change_array); if (position != new_position) { - RelocInfo info_copy(rinfo->pc(), rinfo->rmode(), new_position); + RelocInfo info_copy(rinfo->pc(), rinfo->rmode(), new_position, NULL); buffer_writer.Write(&info_copy); continue; } @@ -1333,6 +1336,8 @@ MaybeObject* LiveEdit::PatchFunctionPositions( info->set_end_position(new_function_end); info->set_function_token_position(new_function_token_pos); + HEAP->EnsureHeapIsIterable(); + if (IsJSFunctionCode(info->code())) { // Patch relocation info section of the code. Handle<Code> patched_code = PatchPositionsInCode(Handle<Code>(info->code()), |