| Index: src/x64/assembler-x64.h
|
| diff --git a/src/x64/assembler-x64.h b/src/x64/assembler-x64.h
|
| index e7135fcb9dbc52f2152d81209639d43c78d3c4b7..70a9e1b283f8654423f3abfe737a39219afd6afd 100644
|
| --- a/src/x64/assembler-x64.h
|
| +++ b/src/x64/assembler-x64.h
|
| @@ -536,15 +536,12 @@ 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,
|
| - ConstantPoolArray* constant_pool);
|
| - static inline void set_target_address_at(Address pc,
|
| - ConstantPoolArray* constant_pool,
|
| - Address target,
|
| - ICacheFlushMode icache_flush_mode =
|
| - FLUSH_ICACHE_IF_NEEDED) ;
|
| + 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,
|
| + ICacheFlushMode icache_flush_mode = FLUSH_ICACHE_IF_NEEDED);
|
| static inline Address target_address_at(Address pc, Code* code) {
|
| - ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL;
|
| + Address constant_pool = code ? code->constant_pool() : NULL;
|
| return target_address_at(pc, constant_pool);
|
| }
|
| static inline void set_target_address_at(Address pc,
|
| @@ -552,7 +549,7 @@ class Assembler : public AssemblerBase {
|
| Address target,
|
| ICacheFlushMode icache_flush_mode =
|
| FLUSH_ICACHE_IF_NEEDED) {
|
| - ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL;
|
| + Address constant_pool = code ? code->constant_pool() : NULL;
|
| set_target_address_at(pc, constant_pool, target, icache_flush_mode);
|
| }
|
|
|
|
|