Refactor generating lazy deoptimization descriptors.

runtime/vm/intermediate_language_x64.cc

Index: runtime/vm/intermediate_language_x64.cc
===================================================================
--- runtime/vm/intermediate_language_x64.cc	(revision 40150)
+++ runtime/vm/intermediate_language_x64.cc	(working copy)
@@ -5888,22 +5888,11 @@
   __ xorq(RBX, RBX);
   __ addq(RCX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ call(RCX);
-  compiler->AddCurrentDescriptor(RawPcDescriptors::kClosureCall,
-                                 deopt_id(),
-                                 token_pos());
-  compiler->RecordSafepoint(locs());
-  // Marks either the continuation point in unoptimized code or the
-  // deoptimization point in optimized code, after call.
-  const intptr_t deopt_id_after = Isolate::ToDeoptAfter(deopt_id());
-  if (compiler->is_optimizing()) {
-    compiler->AddDeoptIndexAtCall(deopt_id_after, token_pos());
-  } else {
-    // Add deoptimization continuation point after the call and before the
-    // arguments are removed.
-    compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
-                                   deopt_id_after,
-                                   token_pos());
-  }
+  compiler->RecordCallInfo(token_pos(),
+                           RawPcDescriptors::kClosureCall,
+                           deopt_id(),
+                           locs(),
+                           locs()->input_count());
   __ Drop(argument_count);
 }