Index: runtime/vm/assembler_ia32.h |
=================================================================== |
--- runtime/vm/assembler_ia32.h (revision 45086) |
+++ runtime/vm/assembler_ia32.h (working copy) |
@@ -302,7 +302,6 @@ |
public: |
explicit Assembler(bool use_far_branches = false) |
: buffer_(), |
- object_pool_(GrowableObjectArray::Handle()), |
prologue_offset_(-1), |
jit_cookie_(0), |
comments_() { |
@@ -801,8 +800,13 @@ |
const ZoneGrowableArray<intptr_t>& GetPointerOffsets() const { |
return buffer_.pointer_offsets(); |
} |
- const GrowableObjectArray& object_pool() const { return object_pool_; } |
+ const GrowableObjectArray& object_pool_data() const { |
+ return object_pool_.data(); |
+ } |
+ |
+ ObjectPool& object_pool() { return object_pool_; } |
+ |
void FinalizeInstructions(const MemoryRegion& region) { |
buffer_.FinalizeInstructions(region); |
} |
@@ -982,7 +986,7 @@ |
int32_t jit_cookie(); |
AssemblerBuffer buffer_; |
- GrowableObjectArray& object_pool_; // Object pool is not used on ia32. |
+ ObjectPool object_pool_; |
intptr_t prologue_offset_; |
int32_t jit_cookie_; |
GrowableArray<CodeComment*> comments_; |