| Index: src/arm/assembler-arm.h
|
| diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
|
| index b629dcea1b54aae14bff848829c9bcdaaed46722..8173b16a1020589f9dbfbe4d37910d2d1db3c418 100644
|
| --- a/src/arm/assembler-arm.h
|
| +++ b/src/arm/assembler-arm.h
|
| @@ -671,19 +671,18 @@ class Assembler : public AssemblerBase {
|
| // Read/Modify the code target address in the branch/call instruction at pc.
|
| INLINE(static Address target_address_at(Address pc, Address constant_pool));
|
| INLINE(static void set_target_address_at(
|
| - Address pc, Address constant_pool, Address target,
|
| + Isolate* isolate, Address pc, Address constant_pool, Address target,
|
| ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED));
|
| INLINE(static Address target_address_at(Address pc, Code* code)) {
|
| Address constant_pool = code ? code->constant_pool() : NULL;
|
| return target_address_at(pc, constant_pool);
|
| }
|
| - INLINE(static void set_target_address_at(Address pc,
|
| - Code* code,
|
| - Address target,
|
| - ICacheFlushMode icache_flush_mode =
|
| - FLUSH_ICACHE_IF_NEEDED)) {
|
| + INLINE(static void set_target_address_at(
|
| + Isolate* isolate, Address pc, Code* code, Address target,
|
| + ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED)) {
|
| Address constant_pool = code ? code->constant_pool() : NULL;
|
| - set_target_address_at(pc, constant_pool, target, icache_flush_mode);
|
| + set_target_address_at(isolate, pc, constant_pool, target,
|
| + icache_flush_mode);
|
| }
|
|
|
| // Return the code target address at a call site from the return address
|
| @@ -697,11 +696,12 @@ class Assembler : public AssemblerBase {
|
| // This sets the branch destination (which is in the constant pool on ARM).
|
| // This is for calls and branches within generated code.
|
| inline static void deserialization_set_special_target_at(
|
| - Address constant_pool_entry, Code* code, Address target);
|
| + Isolate* isolate, Address constant_pool_entry, Code* code,
|
| + Address target);
|
|
|
| // This sets the internal reference at the pc.
|
| inline static void deserialization_set_target_internal_reference_at(
|
| - Address pc, Address target,
|
| + Isolate* isolate, Address pc, Address target,
|
| RelocInfo::Mode mode = RelocInfo::INTERNAL_REFERENCE);
|
|
|
| // Here we are patching the address in the constant pool, not the actual call
|
|
|