Index: runtime/vm/instructions_arm64.cc |
diff --git a/runtime/vm/instructions_arm64.cc b/runtime/vm/instructions_arm64.cc |
index aea111fdc4d1e78a07a5d48ed21466b6c1d2139c..1690456a34d0fa85ea26310ea37fee4a8e789226 100644 |
--- a/runtime/vm/instructions_arm64.cc |
+++ b/runtime/vm/instructions_arm64.cc |
@@ -14,7 +14,7 @@ |
namespace dart { |
CallPattern::CallPattern(uword pc, const Code& code) |
- : object_pool_(Array::Handle(code.ObjectPool())), |
+ : object_pool_(ObjectPool::Handle(code.GetObjectPool())), |
end_(pc), |
args_desc_load_end_(0), |
ic_data_load_end_(0), |
@@ -45,7 +45,7 @@ intptr_t InstructionPattern::OffsetFromPPIndex(intptr_t index) { |
// and the loaded object in the output parameters 'reg' and 'obj' |
// respectively. |
uword InstructionPattern::DecodeLoadObject(uword end, |
- const Array& object_pool, |
+ const ObjectPool& object_pool, |
Register* reg, |
Object* obj) { |
// 1. LoadWordFromPool |
@@ -57,7 +57,7 @@ uword InstructionPattern::DecodeLoadObject(uword end, |
// Case 1. |
intptr_t index = 0; |
start = DecodeLoadWordFromPool(end, reg, &index); |
- *obj = object_pool.At(index); |
+ *obj = object_pool.ObjectAt(index); |
} else { |
// Case 2. |
intptr_t value = 0; |
@@ -264,20 +264,12 @@ RawArray* CallPattern::ClosureArgumentsDescriptor() { |
uword CallPattern::TargetAddress() const { |
- ASSERT(target_address_pool_index_ >= 0); |
- const Object& target_address = |
- Object::Handle(object_pool_.At(target_address_pool_index_)); |
- ASSERT(target_address.IsSmi()); |
- // The address is stored in the object array as a RawSmi. |
- return reinterpret_cast<uword>(target_address.raw()); |
+ return object_pool_.RawValueAt(target_address_pool_index_); |
} |
void CallPattern::SetTargetAddress(uword target_address) const { |
- ASSERT(Utils::IsAligned(target_address, 4)); |
- // The address is stored in the object array as a RawSmi. |
- const Smi& smi = Smi::Handle(reinterpret_cast<RawSmi*>(target_address)); |
- object_pool_.SetAt(target_address_pool_index_, smi); |
+ object_pool_.SetRawValueAt(target_address_pool_index_, target_address); |
// No need to flush the instruction cache, since the code is not modified. |
} |