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

runtime/vm/deopt_instructions.cc

 // 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.
 
 #include "vm/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
 #include "vm/parser.h"
 #include "vm/stack_frame.h"
 #include "vm/thread.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, compress_deopt_info, true,
             "Compress the size of the deoptimization info for optimized code.");
 DECLARE_FLAG(bool, trace_deoptimization);
 DECLARE_FLAG(bool, trace_deoptimization_verbose);
 
 
 DeoptContext::DeoptContext(const StackFrame* frame,
                            const Code& code,
                            DestFrameOptions dest_options,
                            fpu_register_t* fpu_registers,
                            intptr_t* cpu_registers)
     : code_(code.raw()),
-      object_table_(code.object_table()),
+      object_pool_(code.ObjectPool()),
       deopt_info_(TypedData::null()),
       dest_frame_is_allocated_(false),
       dest_frame_(NULL),
       dest_frame_size_(0),
       source_frame_is_allocated_(false),
       source_frame_(NULL),
       source_frame_size_(0),
       cpu_registers_(cpu_registers),
       fpu_registers_(fpu_registers),
       num_args_(0),
@@ skipping 82 matching lines @@
   for (intptr_t i = 0; i < deferred_objects_count_; i++) {
     delete deferred_objects_[i];
   }
   delete[] deferred_objects_;
   deferred_objects_ = NULL;
   deferred_objects_count_ = 0;
 }
 
 
 void DeoptContext::VisitObjectPointers(ObjectPointerVisitor* visitor) {
-  visitor->VisitPointer(reinterpret_cast<RawObject**>(&object_table_));
+  visitor->VisitPointer(reinterpret_cast<RawObject**>(&object_pool_));
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&deopt_info_));
 
   // Visit any object pointers on the destination stack.
   if (dest_frame_is_allocated_) {
     for (intptr_t i = 0; i < dest_frame_size_; i++) {
       if (dest_frame_[i] != 0) {
         visitor->VisitPointer(reinterpret_cast<RawObject**>(&dest_frame_[i]));
       }
     }
   }
@@ skipping 765 matching lines @@
   }
 
  private:
   const DeoptInstr* instruction_;  // Instruction that was written.
   const intptr_t info_number_;  // Index of the deopt info it was written to.
 
   GrowableArray<TrieNode*> children_;
 };
 
 
-DeoptInfoBuilder::DeoptInfoBuilder(Zone* zone, const intptr_t num_args)
+DeoptInfoBuilder::DeoptInfoBuilder(Zone* zone,
+                                   const intptr_t num_args,
+                                   Assembler* assembler)
     : zone_(zone),
       instructions_(),
-      object_table_(GrowableObjectArray::Handle(
-          GrowableObjectArray::New(Heap::kOld))),
       num_args_(num_args),
+      assembler_(assembler),
       trie_root_(new(zone) TrieNode()),
       current_info_number_(0),
       frame_start_(-1),
       materializations_() {
 }
 
 
 intptr_t DeoptInfoBuilder::FindOrAddObjectInTable(const Object& obj) const {
-  for (intptr_t i = 0; i < object_table_.Length(); i++) {
-    if (object_table_.At(i) == obj.raw()) {
-      return i;
-    }
-  }
-  // Add object.
-  const intptr_t result = object_table_.Length();
-  object_table_.Add(obj, Heap::kOld);
-  return result;
+  return assembler_->object_pool().FindObject(obj, kNotPatchable);
 }
 
 
 intptr_t DeoptInfoBuilder::CalculateStackIndex(
     const Location& source_loc) const {
   return source_loc.stack_index() < 0 ?
             source_loc.stack_index() + num_args_ :
             source_loc.stack_index() + num_args_ + kDartFrameFixedSize;
 }
 
@@ skipping 309 matching lines @@
                           Smi* offset,
                           TypedData* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart