| Index: src/ia32/assembler-ia32.h
|
| diff --git a/src/ia32/assembler-ia32.h b/src/ia32/assembler-ia32.h
|
| index b3a8fe9a5978376afcfc09fe434b67bb63e37b80..5a52e795c6b6fec38410fa10a34b773fccfe4adc 100644
|
| --- a/src/ia32/assembler-ia32.h
|
| +++ b/src/ia32/assembler-ia32.h
|
| @@ -513,15 +513,12 @@ 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,
|
| - ConstantPoolArray* constant_pool);
|
| - inline static void set_target_address_at(Address pc,
|
| - ConstantPoolArray* constant_pool,
|
| - Address target,
|
| - ICacheFlushMode icache_flush_mode =
|
| - FLUSH_ICACHE_IF_NEEDED);
|
| + 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,
|
| + 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,
|
| @@ -529,7 +526,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);
|
| }
|
|
|
|
|