Remove deoptimization index PC descriptors.

runtime/vm/flow_graph_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/globals.h"  // Needed here to get TARGET_ARCH_XXX.
 
 #include "vm/flow_graph_compiler.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 282 matching lines @@
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        CurrentTryIndex());
 }
 
 
 void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
                                             intptr_t token_pos) {
   ASSERT(is_optimizing());
-  const intptr_t deopt_index = deopt_infos_.length();
   CompilerDeoptInfo* info = new CompilerDeoptInfo(deopt_id, kDeoptAtCall);
   ASSERT(pending_deoptimization_env_ != NULL);
   info->set_deoptimization_env(pending_deoptimization_env_);
+  info->set_pc_offset(assembler()->CodeSize());
   deopt_infos_.Add(info);
-  pc_descriptors_list()->AddDeoptIndex(assembler()->CodeSize(),
-                                       deopt_id,
-                                       kDeoptAtCall,
-                                       deopt_index);
 }
 
 
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
     BitmapBuilder* bitmap = locs->stack_bitmap();
     ASSERT(bitmap != NULL);
     ASSERT(bitmap->Length() <= StackSize());
     // Pad the bitmap out to describe all the spill slots.
     bitmap->SetLength(StackSize());
@@ skipping 64 matching lines @@
 void FlowGraphCompiler::FinalizePcDescriptors(const Code& code) {
   ASSERT(pc_descriptors_list_ != NULL);
   const PcDescriptors& descriptors = PcDescriptors::Handle(
       pc_descriptors_list_->FinalizePcDescriptors(code.EntryPoint()));
   if (!is_optimizing_) descriptors.Verify(parsed_function_.function());
   code.set_pc_descriptors(descriptors);
 }
 
 
 void FlowGraphCompiler::FinalizeDeoptInfo(const Code& code) {
+  // An entry is a triple of (pc_offset, deopt_info, deopt_reason).
+  const int kEntrySize = 3;

[srdjan, 2012/09/28 21:00:26]

Use a dedicated class to describe the structure of the array.

[Kevin Millikin (Google), 2012/10/01 09:38:56]

Done.

   const Array& array =
-      Array::Handle(Array::New(deopt_infos_.length(), Heap::kOld));
+      Array::Handle(Array::New(deopt_infos_.length() * kEntrySize, Heap::kOld));
+  Smi& offset = Smi::Handle();
   DeoptInfo& info = DeoptInfo::Handle();
-  for (intptr_t i = 0; i < deopt_infos_.length(); i++) {
+  Smi& reason = Smi::Handle();
+  for (intptr_t i = 0, j = 0; i < deopt_infos_.length(); i++) {
+    offset = Smi::New(deopt_infos_[i]->pc_offset());
     info = deopt_infos_[i]->CreateDeoptInfo(this);
-    array.SetAt(i, info);
+    reason = Smi::New(deopt_infos_[i]->reason());
+    array.SetAt(j++, offset);
+    array.SetAt(j++, info);
+    array.SetAt(j++, reason);
   }
   code.set_deopt_info_array(array);
   const Array& object_array = Array::Handle(Array::MakeArray(object_table_));
   code.set_object_table(object_array);
 }
 
 
 void FlowGraphCompiler::FinalizeStackmaps(const Code& code) {
   if (stackmap_table_builder_ == NULL) {
     // The unoptimizing compiler has no stack maps.
@@ skipping 486 matching lines @@
     case ABOVE:         return unsigned_left > unsigned_right;
     case ABOVE_EQUAL:   return unsigned_left >= unsigned_right;
     default:
       UNIMPLEMENTED();
       return false;
   }
 }
 
 
 }  // namespace dart