| Index: src/arm/assembler-arm-inl.h
|
| ===================================================================
|
| --- src/arm/assembler-arm-inl.h (revision 13918)
|
| +++ src/arm/assembler-arm-inl.h (working copy)
|
| @@ -107,13 +107,13 @@
|
|
|
|
|
| Address RelocInfo::target_address() {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
|
| + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| return Assembler::target_address_at(pc_);
|
| }
|
|
|
|
|
| Address RelocInfo::target_address_address() {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY
|
| + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_)
|
| || rmode_ == EMBEDDED_OBJECT
|
| || rmode_ == EXTERNAL_REFERENCE);
|
| return reinterpret_cast<Address>(Assembler::target_pointer_address_at(pc_));
|
| @@ -126,7 +126,7 @@
|
|
|
|
|
| void RelocInfo::set_target_address(Address target, WriteBarrierMode mode) {
|
| - ASSERT(IsCodeTarget(rmode_) || rmode_ == RUNTIME_ENTRY);
|
| + ASSERT(IsCodeTarget(rmode_) || IsRuntimeEntry(rmode_));
|
| Assembler::set_target_address_at(pc_, target);
|
| if (mode == UPDATE_WRITE_BARRIER && host() != NULL && IsCodeTarget(rmode_)) {
|
| Object* target_code = Code::GetCodeFromTargetAddress(target);
|
| @@ -321,7 +321,7 @@
|
| Isolate::Current()->debug()->has_break_points()) {
|
| visitor->VisitDebugTarget(this);
|
| #endif
|
| - } else if (mode == RelocInfo::RUNTIME_ENTRY) {
|
| + } else if (RelocInfo::IsRuntimeEntry(mode)) {
|
| visitor->VisitRuntimeEntry(this);
|
| }
|
| }
|
| @@ -348,7 +348,7 @@
|
| IsPatchedDebugBreakSlotSequence()))) {
|
| StaticVisitor::VisitDebugTarget(heap, this);
|
| #endif
|
| - } else if (mode == RelocInfo::RUNTIME_ENTRY) {
|
| + } else if (RelocInfo::IsRuntimeEntry(mode)) {
|
| StaticVisitor::VisitRuntimeEntry(this);
|
| }
|
| }
|
|
|