Add deopt info to code object and print it

runtime/vm/object.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/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
 #include "vm/bootstrap.h"
 #include "vm/datastream.h"
+#include "vm/deopt_instructions.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/compiler_stats.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/debuginfo.h"
 #include "vm/double_conversion.h"
@@ skipping 6910 matching lines @@
 
 intptr_t DeoptInfo::Instruction(intptr_t index) const {
   return *(EntryAddr(index, kInstruction));
 }
 
 
 const char* DeoptInfo::ToCString() const {
   if (Length() == 0) {
     return "No DeoptInfo";
   }
-  // First compute the buffer size required.
+  // Convert to DeoptInstr.
+  GrowableArray<DeoptInstr*> deopt_instrs(Length());
+  for (intptr_t i = 0; i < Length(); i++) {
+    deopt_instrs.Add(DeoptInstr::Create(Instruction(i), FromIndex(i)));
+  }
+  // Compute the buffer size required.
   intptr_t len = 0;
   for (intptr_t i = 0; i < Length(); i++) {
-    len += OS::SNPrint(NULL, 0, "[%d(%d):%d]",
-        Instruction(i), FromIndex(i), i);
+    len += OS::SNPrint(NULL, 0, "[%s]", deopt_instrs[i]->ToCString());
   }
   // Allocate the buffer.
   char* buffer = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   // Layout the fields in the buffer.
   intptr_t index = 0;
   for (intptr_t i = 0; i < Length(); i++) {
     index += OS::SNPrint((buffer + index),
-                         (len - index),
-                         "[%d(%d):%d]",
-                         Instruction(i),
-                         FromIndex(i),
-                         i);
+                       (len - index) + 1,
+                       "[%s]",
+                       deopt_instrs[i]->ToCString());
   }
   return buffer;
 }
 
 
 RawDeoptInfo* DeoptInfo::New(intptr_t num_commands) {
   ASSERT(Object::deopt_info_class() != Class::null());
   DeoptInfo& result = DeoptInfo::Handle();
   {
     uword size = DeoptInfo::InstanceSize(num_commands);
@@ skipping 4114 matching lines @@
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len + 1));
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart