Emit deoptimization information at static calls (preparation for full deoptimization). …

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 215 matching lines @@
                                              intptr_t token_pos,
                                              intptr_t try_index) {
   pc_descriptors_list()->AddDescriptor(kind,
                                        assembler()->CodeSize(),
                                        deopt_id,
                                        token_pos,
                                        try_index);
 }
 
 
+void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
+                                            intptr_t token_pos) {
+  // TODO(srdjan): Temporary use deopt stubs to maintain deopt-indexes.
+  // kDeoptAtCall will not emit code, but will only generate deoptimization
+  // information.
+  const intptr_t deopt_index = deopt_stubs_.length();
+  AddDeoptStub(deopt_id, -1, kDeoptAtCall);

[Florian Schneider, 2012/08/28 16:00:57]

Maybe kNoTryIndex instead of -1.

Can you also eliminate passing the try_index in other call sites of
AddDeoptStub?

[srdjan, 2012/08/28 17:08:25]

Using kNoTryIndex, will eliminate try_index from AddDeoptStub in a next CL.

+  pc_descriptors_list()->AddDescriptor(PcDescriptors::kDeoptIndex,
+                                       assembler()->CodeSize(),
+                                       deopt_id,
+                                       token_pos,
+                                       deopt_index);
+}
+
+
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
     BitmapBuilder* bitmap = locs->stack_bitmap();
     ASSERT(bitmap != NULL);
     bitmap->SetLength(StackSize());
     stackmap_table_builder_->AddEntry(assembler()->CodeSize(), bitmap);
   }
 }
 
 
@@ skipping 488 matching lines @@
       return;
     }
   }
 
   // This move is not blocked.
   EmitMove(index);
 }
 
 
 }  // namespace dart