| Index: runtime/vm/assembler_arm64.h
|
| diff --git a/runtime/vm/assembler_arm64.h b/runtime/vm/assembler_arm64.h
|
| index 98e3f36b92d905e2d07c2b91b338d01e8a0df4bb..275217677bc1710b809b1bc0517a5ee40237d155 100644
|
| --- a/runtime/vm/assembler_arm64.h
|
| +++ b/runtime/vm/assembler_arm64.h
|
| @@ -476,11 +476,9 @@ class Assembler : public ValueObject {
|
| return buffer_.pointer_offsets();
|
| }
|
|
|
| - const GrowableObjectArray& object_pool_data() const {
|
| - return object_pool_.data();
|
| - }
|
| + ObjectPoolHelper& object_pool() { return object_pool_; }
|
|
|
| - ObjectPool& object_pool() { return object_pool_; }
|
| + RawObjectPool* MakeObjectPool() { return object_pool_.MakeObjectPool(); }
|
|
|
| bool use_far_branches() const {
|
| return FLAG_use_far_branches || use_far_branches_;
|
| @@ -1418,8 +1416,7 @@ class Assembler : public ValueObject {
|
| private:
|
| AssemblerBuffer buffer_; // Contains position independent code.
|
|
|
| - // Objects and patchable jump targets.
|
| - ObjectPool object_pool_;
|
| + ObjectPoolHelper object_pool_;
|
|
|
| int32_t prologue_offset_;
|
|
|
|
|