Eliminate object table and use regular object pool for deoptimization infos.

runtime/vm/deopt_instructions.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 36 matching lines @@
   }
 
   intptr_t GetSourceFp() const;
   intptr_t GetSourcePp() const;
   intptr_t GetSourcePc() const;
 
   intptr_t GetCallerFp() const;
   void SetCallerFp(intptr_t callers_fp);
 
   RawObject* ObjectAt(intptr_t index) const {
-    const Array& object_table = Array::Handle(object_table_);
-    return object_table.At(index);
+    const Array& object_pool = Array::Handle(object_pool_);
+    return object_pool.At(index);
   }
 
   intptr_t RegisterValue(Register reg) const {
     ASSERT(cpu_registers_ != NULL);
     ASSERT(reg >= 0);
     ASSERT(reg < kNumberOfCpuRegisters);
     return cpu_registers_[reg];
   }
 
   double FpuRegisterValue(FpuRegister reg) const {
@@ skipping 129 matching lines @@
   // Claims ownership of the memory for 'object'.
   void SetDeferredObjectAt(intptr_t idx, DeferredObject* object) {
     deferred_objects_[idx] = object;
   }
 
   intptr_t DeferredObjectsCount() const {
     return deferred_objects_count_;
   }
 
   RawCode* code_;
-  RawArray* object_table_;
+  RawArray* object_pool_;
   RawTypedData* deopt_info_;
   bool dest_frame_is_allocated_;
   intptr_t* dest_frame_;
   intptr_t dest_frame_size_;
   bool source_frame_is_allocated_;
   intptr_t* source_frame_;
   intptr_t source_frame_size_;
   intptr_t* cpu_registers_;
   fpu_register_t* fpu_registers_;
   intptr_t num_args_;
@@ skipping 61 matching lines @@
 
   virtual DeoptInstr::Kind kind() const = 0;
 
   bool Equals(const DeoptInstr& other) const {
     return (kind() == other.kind()) && (source_index() == other.source_index());
   }
 
   // Get the code and return address which is encoded in this
   // kRetAfterAddress deopt instruction.
   static uword GetRetAddress(DeoptInstr* instr,
-                             const Array& object_table,
+                             const Array& object_pool,
                              Code* code);
 
   // Return number of initialized fields in the object that will be
   // materialized by kMaterializeObject instruction.
   static intptr_t GetFieldCount(DeoptInstr* instr) {
     ASSERT(instr->kind() == DeoptInstr::kMaterializeObject);
     return instr->source_index();
   }
 
  protected:
@@ skipping 111 matching lines @@
 typedef RegisterSource<FpuRegister> FpuRegisterSource;
 
 
 // Builds a deoptimization info table, one DeoptInfo at a time.  Call AddXXX
 // methods in the order of their target, starting wih deoptimized code
 // continuation pc and ending with the first argument of the deoptimized
 // code.  Call CreateDeoptInfo to write the accumulated instructions into
 // the heap and reset the builder's internal state for the next DeoptInfo.
 class DeoptInfoBuilder : public ValueObject {
  public:
-  DeoptInfoBuilder(Zone* zone, const intptr_t num_args);
-
-  // 'object_table' holds all objects referred to by DeoptInstr in
-  // all DeoptInfo instances for a single Code object.
-  const GrowableObjectArray& object_table() { return object_table_; }
+  DeoptInfoBuilder(Zone* zone, const intptr_t num_args, Assembler* assembler);
 
   // Return address before instruction.
   void AddReturnAddress(const Function& function,
                         intptr_t deopt_id,
                         intptr_t dest_index);
 
   // Copy from optimized frame to unoptimized.
   void AddCopy(Value* value, const Location& source_loc, intptr_t dest_index);
   void AddPcMarker(const Function& function, intptr_t dest_index);
   void AddPp(const Function& function, intptr_t dest_index);
@@ skipping 41 matching lines @@
     return instructions_.length() - frame_start_;
   }
 
   void AddConstant(const Object& obj, intptr_t dest_index);
 
   Zone* zone() const { return zone_; }
 
   Zone* zone_;
 
   GrowableArray<DeoptInstr*> instructions_;
-  const GrowableObjectArray& object_table_;
   const intptr_t num_args_;
+  Assembler* assembler_;
 
   // Used to compress entries by sharing suffixes.
   TrieNode* trie_root_;
   intptr_t current_info_number_;
 
   intptr_t frame_start_;
   GrowableArray<MaterializeObjectInstr*> materializations_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptInfoBuilder);
 };
@@ skipping 37 matching lines @@
   class ReasonField : public BitField<ICData::DeoptReasonId, 0, 8> { };
   class FlagsField : public BitField<uint32_t, 8, 8> { };
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_