| Index: src/x64/assembler-x64.h
|
| diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
|
| index d81cb741011ba939b9ba5e08d68ada2cbb3bca25..5e734c8426677a0da58fdc12a087983cde80df06 100644
|
| --- a/src/x64/assembler-x64.h
|
| +++ b/src/x64/assembler-x64.h
|
| @@ -555,8 +555,19 @@ class Assembler : public AssemblerBase {
|
| // the absolute address of the target.
|
| // These functions convert between absolute Addresses of Code objects and
|
| // the relative displacements stored in the code.
|
| - static inline Address target_address_at(Address pc);
|
| - static inline void set_target_address_at(Address pc, Address target);
|
| + static inline Address target_address_at(Address pc,
|
| + ConstantPoolArray* constant_pool);
|
| + static inline void set_target_address_at(Address pc,
|
| + ConstantPoolArray* constant_pool,
|
| + Address target);
|
| + static inline Address target_address_at(Address pc, Code* code) {
|
| + return target_address_at(pc, code->constant_pool());
|
| + }
|
| + static inline void set_target_address_at(Address pc,
|
| + Code* code,
|
| + Address target) {
|
| + set_target_address_at(pc, code->constant_pool(), target);
|
| + }
|
|
|
| // Return the code target address at a call site from the return address
|
| // of that call in the instruction stream.
|
| @@ -565,8 +576,8 @@ 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, Address target) {
|
| - set_target_address_at(instruction_payload, target);
|
| + Address instruction_payload, Code* code, Address target) {
|
| + set_target_address_at(instruction_payload, code, target);
|
| }
|
|
|
| static inline RelocInfo::Mode RelocInfoNone() {
|
|
|