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

runtime/vm/compiler.cc

 // Copyright (c) 2012, 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/compiler.h"
 
 #include "vm/assembler.h"
 
 #include "vm/ast_printer.h"
 #include "vm/block_scheduler.h"
@@ skipping 701 matching lines @@
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::graphcompiler_timer,
                          isolate);
         graph_compiler.CompileGraph();
         pipeline->FinalizeCompilation();
       }
       {
         TimerScope timer(FLAG_compiler_stats,
                          &CompilerStats::codefinalizer_timer,
                          isolate);
+        // CreateDeoptInfo uses the object pool and needs to be done before
+        // FinalizeCode.
+        const Array& deopt_info_array = Array::Handle(
+            graph_compiler.CreateDeoptInfo(&assembler));
         const Code& code = Code::Handle(
             Code::FinalizeCode(function, &assembler, optimized));
         code.set_is_optimized(optimized);
         code.set_inlined_intervals(graph_compiler.inlined_code_intervals());
         code.set_inlined_id_to_function(
             Array::Handle(graph_compiler.InliningIdToFunction()));
         graph_compiler.FinalizePcDescriptors(code);
-        graph_compiler.FinalizeDeoptInfo(code);
+        code.set_deopt_info_array(deopt_info_array);
         graph_compiler.FinalizeStackmaps(code);
         graph_compiler.FinalizeVarDescriptors(code);
         graph_compiler.FinalizeExceptionHandlers(code);
         graph_compiler.FinalizeStaticCallTargetsTable(code);
 
         if (optimized) {
           if (osr_id == Isolate::kNoDeoptId) {
             CodePatcher::PatchEntry(Code::Handle(function.CurrentCode()));
             if (FLAG_trace_compiler || FLAG_trace_patching) {
               if (FLAG_trace_compiler) {
@@ skipping 115 matching lines @@
       ISL_Print("%4" Pd ": 0x%" Px "  %s  (%s)\n",
                 i,
                 start + offset.Value(),
                 DeoptInfo::ToCString(deopt_table, info),
                 DeoptReasonToCString(
                     static_cast<ICData::DeoptReasonId>(reason)));
     }
     ISL_Print("}\n");
   }
 
-  const Array& object_table = Array::Handle(code.object_table());
-  if (object_table.Length() > 0) {
-    ISL_Print("Object Table: {\n");
-    for (intptr_t i = 0; i < object_table.Length(); i++) {
-      ISL_Print("  %" Pd ": %s\n", i,
-          Object::Handle(object_table.At(i)).ToCString());
-    }
-    ISL_Print("}\n");
-  }
-
-  const Array& object_pool = Array::Handle(
-      Instructions::Handle(code.instructions()).object_pool());
+  const Array& object_pool = Array::Handle(code.ObjectPool());
   if (object_pool.Length() > 0) {
     ISL_Print("Object Pool: {\n");
     for (intptr_t i = 0; i < object_pool.Length(); i++) {
       ISL_Print("  %" Pd ": %s\n", i,
           Object::Handle(object_pool.At(i)).ToCString());
     }
     ISL_Print("}\n");
   }
 
   ISL_Print("Stackmaps for function '%s' {\n", function_fullname);
@@ skipping 388 matching lines @@
     const Object& result =
       PassiveObject::Handle(isolate->object_store()->sticky_error());
     isolate->object_store()->clear_sticky_error();
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
 }  // namespace dart