| Index: src/mark-compact.cc
|
| ===================================================================
|
| --- src/mark-compact.cc (revision 4816)
|
| +++ src/mark-compact.cc (working copy)
|
| @@ -273,8 +273,10 @@
|
| }
|
|
|
| void VisitDebugTarget(RelocInfo* rinfo) {
|
| - ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| - rinfo->IsPatchedReturnSequence());
|
| + ASSERT((RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| + rinfo->IsPatchedReturnSequence()) ||
|
| + (RelocInfo::IsDebugBreakSlot(rinfo->rmode()) &&
|
| + rinfo->IsPatchedDebugBreakSlotSequence()));
|
| HeapObject* code = Code::GetCodeFromTargetAddress(rinfo->call_address());
|
| MarkCompactCollector::MarkObject(code);
|
| }
|
| @@ -1106,8 +1108,10 @@
|
| }
|
|
|
| void VisitDebugTarget(RelocInfo* rinfo) {
|
| - ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| - rinfo->IsPatchedReturnSequence());
|
| + ASSERT((RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| + rinfo->IsPatchedReturnSequence()) ||
|
| + (RelocInfo::IsDebugBreakSlot(rinfo->rmode()) &&
|
| + rinfo->IsPatchedDebugBreakSlotSequence()));
|
| Object* target = Code::GetCodeFromTargetAddress(rinfo->call_address());
|
| VisitPointer(&target);
|
| rinfo->set_call_address(Code::cast(target)->instruction_start());
|
| @@ -1856,8 +1860,10 @@
|
| }
|
|
|
| void VisitDebugTarget(RelocInfo* rinfo) {
|
| - ASSERT(RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| - rinfo->IsPatchedReturnSequence());
|
| + ASSERT((RelocInfo::IsJSReturn(rinfo->rmode()) &&
|
| + rinfo->IsPatchedReturnSequence()) ||
|
| + (RelocInfo::IsDebugBreakSlot(rinfo->rmode()) &&
|
| + rinfo->IsPatchedDebugBreakSlotSequence()));
|
| Object* target = Code::GetCodeFromTargetAddress(rinfo->call_address());
|
| VisitPointer(&target);
|
| rinfo->set_call_address(
|
|
|