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

runtime/vm/flow_graph_compiler_x64.cc

Index: runtime/vm/flow_graph_compiler_x64.cc
===================================================================
--- runtime/vm/flow_graph_compiler_x64.cc	(revision 11464)
+++ runtime/vm/flow_graph_compiler_x64.cc	(working copy)
@@ -26,6 +26,8 @@
 
 void DeoptimizationStub::GenerateCode(FlowGraphCompiler* compiler,
                                       intptr_t stub_ix) {
+  // Calls do not need stubs, they share a deoptimization trampoline.
+  if (reason_ == kDeoptAtCall) return;
   Assembler* assem = compiler->assembler();
 #define __ assem->
   __ Comment("Deopt stub for id %d", deopt_id_);
@@ -1062,6 +1064,9 @@
   AddCurrentDescriptor(PcDescriptors::kFuncCall, deopt_id, token_pos,
                        try_index);
   RecordSafepoint(locs);
+  if (is_optimizing()) {
+    AddDeoptIndexAtCall(deopt_id, token_pos);
+  }
   __ Drop(argument_count);
 }