Adding deopt info to code object.

runtime/vm/raw_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/raw_object.h"
 
 #include "vm/class_table.h"
 #include "vm/freelist.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 212 matching lines @@
         instance_size = LocalVarDescriptors::InstanceSize(num_descriptors);
         break;
       }
       case kExceptionHandlers: {
         const RawExceptionHandlers* raw_handlers =
             reinterpret_cast<const RawExceptionHandlers*>(this);
         intptr_t num_handlers = Smi::Value(raw_handlers->ptr()->length_);
         instance_size = ExceptionHandlers::InstanceSize(num_handlers);
         break;
       }
+      case kDeoptInfo: {
+        const RawDeoptInfo* raw_handlers =
+            reinterpret_cast<const RawDeoptInfo*>(this);
+        intptr_t num_handlers = Smi::Value(raw_handlers->ptr()->length_);

[siva, 2012/08/02 16:57:37]

num_handlers => num_entries ?
as these are not exception handler entries but just deopt entries.

similarly instead of raw_handlers raw_deoptinfo

[srdjan, 2012/08/02 17:51:44]

Done.

+        instance_size = DeoptInfo::InstanceSize(num_handlers);
+        break;
+      }
       case kJSRegExp: {
         const RawJSRegExp* raw_jsregexp =
             reinterpret_cast<const RawJSRegExp*>(this);
         intptr_t data_length = Smi::Value(raw_jsregexp->ptr()->data_length_);
         instance_size = JSRegExp::InstanceSize(data_length);
         break;
       }
       case kFreeListElement: {
         ASSERT(FreeBit::decode(ptr()->tags_));
         uword addr = RawObject::ToAddr(const_cast<RawObject*>(this));
@@ skipping 258 matching lines @@
 
 intptr_t RawExceptionHandlers::VisitExceptionHandlersPointers(
     RawExceptionHandlers* raw_obj, ObjectPointerVisitor* visitor) {
   RawExceptionHandlers* obj = raw_obj->ptr();
   intptr_t length = Smi::Value(obj->length_);
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->length_));
   return ExceptionHandlers::InstanceSize(length);
 }
 
 
+intptr_t RawDeoptInfo::VisitDeoptInfoPointers(
+    RawDeoptInfo* raw_obj, ObjectPointerVisitor* visitor) {
+  RawDeoptInfo* obj = raw_obj->ptr();
+  intptr_t length = Smi::Value(obj->length_);
+  visitor->VisitPointer(reinterpret_cast<RawObject**>(&obj->length_));
+  return DeoptInfo::InstanceSize(length);
+}
+
+
 intptr_t RawContext::VisitContextPointers(RawContext* raw_obj,
                                           ObjectPointerVisitor* visitor) {
   intptr_t num_variables = raw_obj->ptr()->num_variables_;
   visitor->VisitPointers(raw_obj->from(), raw_obj->to(num_variables));
   return Context::InstanceSize(num_variables);
 }
 
 
 intptr_t RawContextScope::VisitContextScopePointers(
     RawContextScope* raw_obj, ObjectPointerVisitor* visitor) {
@@ skipping 432 matching lines @@
 intptr_t RawJSRegExp::VisitJSRegExpPointers(RawJSRegExp* raw_obj,
                                             ObjectPointerVisitor* visitor) {
   // Make sure that we got here with the tagged pointer as this.
   ASSERT(raw_obj->IsHeapObject());
   intptr_t length = Smi::Value(raw_obj->ptr()->data_length_);
   visitor->VisitPointers(raw_obj->from(), raw_obj->to());
   return JSRegExp::InstanceSize(length);
 }
 
 }  // namespace dart