| Index: src/ia32/assembler-ia32.h
|
| diff --git a/src/ia32/assembler-ia32.h b/src/ia32/assembler-ia32.h
|
| index 12e2e3c2bfefdf3b67a6fdd50f386929d4df6432..98b987b69a6eaea13cd7dfdc3b21c9d4fd78b872 100644
|
| --- a/src/ia32/assembler-ia32.h
|
| +++ b/src/ia32/assembler-ia32.h
|
| @@ -624,8 +624,19 @@ class Assembler : public AssemblerBase {
|
| void GetCode(CodeDesc* desc);
|
|
|
| // Read/Modify the code target in the branch/call instruction at pc.
|
| - inline static Address target_address_at(Address pc);
|
| - inline static void set_target_address_at(Address pc, Address target);
|
| + inline static Address target_address_at(Address pc,
|
| + ConstantPoolArray* constant_pool);
|
| + inline static 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.
|
| @@ -634,8 +645,8 @@ 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, 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 const int kSpecialTargetSize = kPointerSize;
|
|
|