Add deopt info to code object and print it

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/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 199 matching lines @@
       graph_compiler.CompileGraph();
     }
     {
       TimerScope timer(FLAG_compiler_stats,
                        &CompilerStats::codefinalizer_timer,
                        isolate);
       const Function& function = parsed_function.function();
       const Code& code = Code::Handle(Code::FinalizeCode(function, &assembler));
       code.set_is_optimized(optimized);
       graph_compiler.FinalizePcDescriptors(code);
+      graph_compiler.FinalizeDeoptInfo(code);
       graph_compiler.FinalizeStackmaps(code);
       graph_compiler.FinalizeVarDescriptors(code);
       graph_compiler.FinalizeExceptionHandlers(code);
       graph_compiler.FinalizeComments(code);
       if (optimized) {
         function.SetCode(code);
         CodePatcher::PatchEntry(Code::Handle(function.unoptimized_code()));
         if (FLAG_trace_compiler) {
           OS::Print("--> patching entry 0x%x\n",
                     Code::Handle(function.unoptimized_code()).EntryPoint());
@@ skipping 84 matching lines @@
       OS::Print("Pointer offsets for function: {\n");
       for (intptr_t i = 0; i < code.pointer_offsets_length(); i++) {
         const uword addr = code.GetPointerOffsetAt(i) + code.EntryPoint();
         Object& obj = Object::Handle();
         obj = *reinterpret_cast<RawObject**>(addr);
         OS::Print(" %d : 0x%x '%s'\n",
                   code.GetPointerOffsetAt(i), addr, obj.ToCString());
       }
       OS::Print("}\n");
       OS::Print("PC Descriptors for function '%s' {\n", function_fullname);
-      OS::Print("(pc\t\tkind\tid\ttry-ix\ttoken-index)\n");
+      OS::Print("(pc\t\tkind\t\tid\ttok-ix\ttry/deopt-ix)\n");
       const PcDescriptors& descriptors =
           PcDescriptors::Handle(code.pc_descriptors());
       OS::Print("%s", descriptors.ToCString());
-      OS::Print("}\n");
+      OS::Print("\n}\n");

[siva, 2012/08/04 01:21:50]

Could you move the \n to %s\n" above so that this is uniform like other places
as OS::Print("}\n");

[srdjan, 2012/08/06 20:09:05]

Done.

+      const Array& deopt_info_array = Array::Handle(code.deopt_info_array());
+      if (deopt_info_array.Length() > 0) {
+        OS::Print("DeoptInfo: {\n");
+        for (intptr_t i = 0; i < deopt_info_array.Length(); i++) {
+          OS::Print("  %d: %s\n",
+              i, Object::Handle(deopt_info_array.At(i)).ToCString());
+        }
+        OS::Print("}\n");
+      }
+      const Array& object_table = Array::Handle(code.object_table());
+      if (object_table.Length() > 0) {
+        OS::Print("Object Table: {\n");
+        for (intptr_t i = 0; i < object_table.Length(); i++) {
+          OS::Print("  %d: %s\n", i,
+              Object::Handle(object_table.At(i)).ToCString());
+        }
+        OS::Print("}\n");
+      }
       OS::Print("Variable Descriptors for function '%s' {\n",
                 function_fullname);
       const LocalVarDescriptors& var_descriptors =
           LocalVarDescriptors::Handle(code.var_descriptors());
       intptr_t var_desc_length =
           var_descriptors.IsNull() ? 0 : var_descriptors.Length();
       String& var_name = String::Handle();
       for (intptr_t i = 0; i < var_desc_length; i++) {
         var_name = var_descriptors.GetName(i);
         RawLocalVarDescriptors::VarInfo var_info;
@@ skipping 150 matching lines @@
     Object& result = Object::Handle();
     result = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
     isolate->set_long_jump_base(base);
     return result.raw();
   }
   UNREACHABLE();
   return Object::null();
 }
 
-
 }  // namespace dart