| Index: src/x64/assembler-x64.h
|
| diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
|
| index 1ea78aac1793b08c387c789526b9c9a27f44bb68..ced06a388ee230923f855e14cc9b11dc7c15af36 100644
|
| --- a/src/x64/assembler-x64.h
|
| +++ b/src/x64/assembler-x64.h
|
| @@ -496,19 +496,18 @@ class Assembler : public AssemblerBase {
|
| // the relative displacements stored in the code.
|
| static inline Address target_address_at(Address pc, Address constant_pool);
|
| static inline 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);
|
| static inline Address target_address_at(Address pc, Code* code) {
|
| Address constant_pool = code ? code->constant_pool() : NULL;
|
| return target_address_at(pc, constant_pool);
|
| }
|
| - static inline void set_target_address_at(Address pc,
|
| - Code* code,
|
| - Address target,
|
| - ICacheFlushMode icache_flush_mode =
|
| - FLUSH_ICACHE_IF_NEEDED) {
|
| + static inline 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
|
| @@ -518,13 +517,14 @@ class Assembler : public AssemblerBase {
|
| // This sets the branch destination (which is in the instruction on x64).
|
| // This is for calls and branches within generated code.
|
| inline static void deserialization_set_special_target_at(
|
| - Address instruction_payload, Code* code, Address target) {
|
| - set_target_address_at(instruction_payload, code, target);
|
| + Isolate* isolate, Address instruction_payload, Code* code,
|
| + Address target) {
|
| + set_target_address_at(isolate, instruction_payload, code, 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);
|
|
|
| static inline RelocInfo::Mode RelocInfoNone() {
|
|
|