| Index: src/arm/assembler-arm-inl.h
|
| diff --git a/src/arm/assembler-arm-inl.h b/src/arm/assembler-arm-inl.h
|
| index 7f9f4cebe2b8becca6aab33c0ab1d54775526bd4..79f9c7bd2b3224cc3cf5696db874cd1d328c510c 100644
|
| --- a/src/arm/assembler-arm-inl.h
|
| +++ b/src/arm/assembler-arm-inl.h
|
| @@ -64,7 +64,9 @@ Address RelocInfo::target_address() {
|
|
|
|
|
| Address RelocInfo::target_address_address() {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
|
| + ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY
|
| + || rmode_ == EMBEDDED_OBJECT
|
| + || rmode_ == EXTERNAL_REFERENCE);
|
| return reinterpret_cast<Address>(Assembler::target_address_address_at(pc_));
|
| }
|
|
|
| @@ -224,7 +226,7 @@ void RelocInfo::Visit(ObjectVisitor* visitor) {
|
| } else if (mode == RelocInfo::GLOBAL_PROPERTY_CELL) {
|
| visitor->VisitGlobalPropertyCell(this);
|
| } else if (mode == RelocInfo::EXTERNAL_REFERENCE) {
|
| - visitor->VisitExternalReference(target_reference_address());
|
| + visitor->VisitExternalReference(this);
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| // TODO(isolates): Get a cached isolate below.
|
| } else if (((RelocInfo::IsJSReturn(mode) &&
|
| @@ -250,7 +252,7 @@ void RelocInfo::Visit(Heap* heap) {
|
| } else if (mode == RelocInfo::GLOBAL_PROPERTY_CELL) {
|
| StaticVisitor::VisitGlobalPropertyCell(heap, this);
|
| } else if (mode == RelocInfo::EXTERNAL_REFERENCE) {
|
| - StaticVisitor::VisitExternalReference(target_reference_address());
|
| + StaticVisitor::VisitExternalReference(this);
|
| #ifdef ENABLE_DEBUGGER_SUPPORT
|
| } else if (heap->isolate()->debug()->has_break_points() &&
|
| ((RelocInfo::IsJSReturn(mode) &&
|
|
|