| Index: src/arm64/assembler-arm64-inl.h
|
| diff --git a/src/arm64/assembler-arm64-inl.h b/src/arm64/assembler-arm64-inl.h
|
| index bbd44c5f106bec92a28db8075c26ecdb1ebcf500..1432c288d8d8d0bed2815c03222ebe22236b811f 100644
|
| --- a/src/arm64/assembler-arm64-inl.h
|
| +++ b/src/arm64/assembler-arm64-inl.h
|
| @@ -586,13 +586,14 @@
|
|
|
|
|
| // Read/Modify the code target address in the branch/call instruction at pc.
|
| -Address Assembler::target_address_at(Address pc, Address constant_pool) {
|
| +Address Assembler::target_address_at(Address pc,
|
| + ConstantPoolArray* constant_pool) {
|
| return Memory::Address_at(target_pointer_address_at(pc));
|
| }
|
|
|
|
|
| Address Assembler::target_address_at(Address pc, Code* code) {
|
| - Address constant_pool = code ? code->constant_pool() : NULL;
|
| + ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL;
|
| return target_address_at(pc, constant_pool);
|
| }
|
|
|
| @@ -664,7 +665,8 @@
|
| }
|
|
|
|
|
| -void Assembler::set_target_address_at(Address pc, Address constant_pool,
|
| +void Assembler::set_target_address_at(Address pc,
|
| + ConstantPoolArray* constant_pool,
|
| Address target,
|
| ICacheFlushMode icache_flush_mode) {
|
| Memory::Address_at(target_pointer_address_at(pc)) = target;
|
| @@ -683,7 +685,7 @@
|
| Code* code,
|
| Address target,
|
| ICacheFlushMode icache_flush_mode) {
|
| - Address constant_pool = code ? code->constant_pool() : NULL;
|
| + ConstantPoolArray* constant_pool = code ? code->constant_pool() : NULL;
|
| set_target_address_at(pc, constant_pool, target, icache_flush_mode);
|
| }
|
|
|
|
|