| Index: src/ia32/assembler-ia32.h
|
| diff --git a/src/ia32/assembler-ia32.h b/src/ia32/assembler-ia32.h
|
| index 034029fa087e0507869b9fd58bc395186bda8a0b..c8485993d5c52617972d9219b6878c2e593ab1d9 100644
|
| --- a/src/ia32/assembler-ia32.h
|
| +++ b/src/ia32/assembler-ia32.h
|
| @@ -486,19 +486,17 @@ class Assembler : public AssemblerBase {
|
| // Read/Modify the code target 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);
|
| 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);
|
| + set_target_address_at(isolate, pc, constant_pool, target);
|
| }
|
|
|
| // Return the code target address at a call site from the return address
|
| @@ -508,13 +506,14 @@ class Assembler : public AssemblerBase {
|
| // This sets the branch destination (which is in the instruction on x86).
|
| // 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 const int kSpecialTargetSize = kPointerSize;
|
|
|