| Index: src/arm/assembler-arm.cc
|
| diff --git a/src/arm/assembler-arm.cc b/src/arm/assembler-arm.cc
|
| index b473c6b52b045c6b93c22028ed04fd3a518ff878..b39d9ee1227e255b1af96ef76ea81e46353ee97b 100644
|
| --- a/src/arm/assembler-arm.cc
|
| +++ b/src/arm/assembler-arm.cc
|
| @@ -305,16 +305,20 @@ void RelocInfo::PatchCodeWithCall(Address target, int guard_bytes) {
|
| // See assembler-arm-inl.h for inlined constructors
|
|
|
| Operand::Operand(Handle<Object> handle) {
|
| +#ifdef DEBUG
|
| + Isolate* isolate = Isolate::Current();
|
| +#endif
|
| + ALLOW_HANDLE_DEREF(isolate, "using and embedding raw address");
|
| rm_ = no_reg;
|
| // Verify all Objects referred by code are NOT in new space.
|
| Object* obj = *handle;
|
| - ASSERT(!HEAP->InNewSpace(obj));
|
| + ASSERT(!isolate->heap()->InNewSpace(obj));
|
| if (obj->IsHeapObject()) {
|
| imm32_ = reinterpret_cast<intptr_t>(handle.location());
|
| rmode_ = RelocInfo::EMBEDDED_OBJECT;
|
| } else {
|
| // no relocation needed
|
| - imm32_ = reinterpret_cast<intptr_t>(obj);
|
| + imm32_ = reinterpret_cast<intptr_t>(obj);
|
| rmode_ = RelocInfo::NONE32;
|
| }
|
| }
|
|
|