Reapply "Deoptimization support in inlined code."

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"
@@ skipping 7096 matching lines @@
   }
   return buffer;
 }
 
 
 // Verify assumptions (in debug mode only).
 // - No two deopt descriptors have the same deoptimization id.
 // - No two ic-call descriptors have the same deoptimization id (type feedback).
 // A function without unique ids is marked as non-optimizable (e.g., because of
 // finally blocks).
-void PcDescriptors::Verify(bool check_ids) const {
+void PcDescriptors::Verify(const Function& function) const {
 #if defined(DEBUG)
   // TODO(srdjan): Implement a more efficient way to check, currently drop
   // the check for too large number of descriptors.
   if (Length() > 3000) {
     if (FLAG_trace_compiler) {
       OS::Print("Not checking pc decriptors, length %"Pd"\n", Length());
     }
     return;
   }
+  // Only check ids for unoptimized code that is optimizable.
+  if (!function.is_optimizable()) return;
   for (intptr_t i = 0; i < Length(); i++) {
     PcDescriptors::Kind kind = DescriptorKind(i);
     // 'deopt_id' is set for kDeopt and kIcCall and must be unique for one kind.
     intptr_t deopt_id = Isolate::kNoDeoptId;
-    if (check_ids) {
-      if ((DescriptorKind(i) == PcDescriptors::kDeoptBefore) ||
-          (DescriptorKind(i) == PcDescriptors::kIcCall)) {
-        deopt_id = DeoptId(i);
-      }
+    if ((DescriptorKind(i) == PcDescriptors::kDeoptBefore) ||
+        (DescriptorKind(i) == PcDescriptors::kIcCall)) {
+      deopt_id = DeoptId(i);
     }
     for (intptr_t k = i + 1; k < Length(); k++) {
       if (kind == DescriptorKind(k)) {
         if (deopt_id != Isolate::kNoDeoptId) {
           ASSERT(DeoptId(k) != deopt_id);
         }
       }
     }
   }
 #endif  // DEBUG
@@ skipping 617 matching lines @@
       }
       node_ids->Add(deopt_id);
       ic_data_obj = CodePatcher::GetInstanceCallIcDataAt(descriptors.PC(i));
       ic_data_objs.Add(ic_data_obj);
     }
   }
   return max_id;
 }
 
 
+RawArray* Code::ExtractTypeFeedbackArray() const {
+  ASSERT(!IsNull() && !is_optimized());
+  GrowableArray<intptr_t> deopt_ids;
+  const GrowableObjectArray& ic_data_objs =
+      GrowableObjectArray::Handle(GrowableObjectArray::New());
+  const intptr_t max_id =
+      ExtractIcDataArraysAtCalls(&deopt_ids, ic_data_objs);
+  const Array& result = Array::Handle(Array::New(max_id + 1));
+  for (intptr_t i = 0; i < deopt_ids.length(); i++) {
+    intptr_t result_index = deopt_ids[i];
+    ASSERT(result.At(result_index) == Object::null());
+    result.SetAt(result_index, Object::Handle(ic_data_objs.At(i)));
+  }
+  return result.raw();
+}
+
+
 RawStackmap* Code::GetStackmap(uword pc, Array* maps, Stackmap* map) const {
   // This code is used during iterating frames during a GC and hence it
   // should not in turn start a GC.
   NoGCScope no_gc;
   if (stackmaps() == Array::null()) {
     // No stack maps are present in the code object which means this
     // frame relies on tagged pointers.
     return Stackmap::null();
   }
   // A stack map is present in the code object, use the stack map to visit
@@ skipping 3832 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart