| Index: src/arm/assembler-arm-inl.h
|
| ===================================================================
|
| --- src/arm/assembler-arm-inl.h (revision 7267)
|
| +++ src/arm/assembler-arm-inl.h (working copy)
|
| @@ -203,11 +203,12 @@
|
| } else if (mode == RelocInfo::EXTERNAL_REFERENCE) {
|
| visitor->VisitExternalReference(target_reference_address());
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| - } else if (Debug::has_break_points() &&
|
| - ((RelocInfo::IsJSReturn(mode) &&
|
| + // TODO(isolates): Get a cached isolate below.
|
| + } else if (((RelocInfo::IsJSReturn(mode) &&
|
| IsPatchedReturnSequence()) ||
|
| (RelocInfo::IsDebugBreakSlot(mode) &&
|
| - IsPatchedDebugBreakSlotSequence()))) {
|
| + IsPatchedDebugBreakSlotSequence())) &&
|
| + Isolate::Current()->debug()->has_break_points()) {
|
| visitor->VisitDebugTarget(this);
|
| #endif
|
| } else if (mode == RelocInfo::RUNTIME_ENTRY) {
|
| @@ -217,10 +218,10 @@
|
|
|
|
|
| template<typename StaticVisitor>
|
| -void RelocInfo::Visit() {
|
| +void RelocInfo::Visit(Heap* heap) {
|
| RelocInfo::Mode mode = rmode();
|
| if (mode == RelocInfo::EMBEDDED_OBJECT) {
|
| - StaticVisitor::VisitPointer(target_object_address());
|
| + StaticVisitor::VisitPointer(heap, target_object_address());
|
| } else if (RelocInfo::IsCodeTarget(mode)) {
|
| StaticVisitor::VisitCodeTarget(this);
|
| } else if (mode == RelocInfo::GLOBAL_PROPERTY_CELL) {
|
| @@ -228,7 +229,7 @@
|
| } else if (mode == RelocInfo::EXTERNAL_REFERENCE) {
|
| StaticVisitor::VisitExternalReference(target_reference_address());
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| - } else if (Debug::has_break_points() &&
|
| + } else if (heap->isolate()->debug()->has_break_points() &&
|
| ((RelocInfo::IsJSReturn(mode) &&
|
| IsPatchedReturnSequence()) ||
|
| (RelocInfo::IsDebugBreakSlot(mode) &&
|
|
|