Refactor generating lazy deoptimization descriptors.

runtime/vm/flow_graph_compiler.cc

 // Copyright (c) 2013, 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/bit_vector.h"
 #include "vm/cha.h"
@@ skipping 523 matching lines @@
   static_calls_target_table_.Add(
       Smi::Handle(Smi::New(assembler()->CodeSize())));
   ASSERT(Code::kSCallTableFunctionEntry == 1);
   static_calls_target_table_.Add(func);
   ASSERT(Code::kSCallTableCodeEntry == 2);
   static_calls_target_table_.Add(Code::Handle());
 }
 
 
 void FlowGraphCompiler::AddDeoptIndexAtCall(intptr_t deopt_id,
-                                            intptr_t token_pos) {
+                                            intptr_t token_pos,
+                                            intptr_t input_count) {
   ASSERT(is_optimizing());
   ASSERT(!intrinsic_mode());
+  Environment* env = pending_deoptimization_env_->DeepCopy(
+      isolate(), pending_deoptimization_env_->Length() - input_count);
   CompilerDeoptInfo* info =
       new CompilerDeoptInfo(deopt_id,
                             ICData::kDeoptAtCall,
-                            pending_deoptimization_env_);
+                            env);
   info->set_pc_offset(assembler()->CodeSize());
   deopt_infos_.Add(info);
 }
 
 
 // This function must be in sync with FlowGraphCompiler::SaveLiveRegisters
 // and FlowGraphCompiler::SlowPathEnvironmentFor.
 void FlowGraphCompiler::RecordSafepoint(LocationSummary* locs) {
   if (is_optimizing()) {
     RegisterSet* registers = locs->live_registers();
@@ skipping 304 matching lines @@
   // "Deoptimization" from intrinsic continues here. All deoptimization
   // branches from intrinsic code redirect to here where the slow-path
   // (normal function body) starts.
   // This means that there must not be any side-effects in intrinsic code
   // before any deoptimization point.
   ASSERT(!intrinsic_slow_path_label_.IsBound());
   assembler()->Bind(&intrinsic_slow_path_label_);
 }
 
 
+// Record safe point and deoptimization info if applicable.
+void FlowGraphCompiler::RecordCallInfo(intptr_t token_pos,
+                                       RawPcDescriptors::Kind kind,
+                                       intptr_t deopt_id,
+                                       LocationSummary* locs,
+                                       intptr_t input_count_adjustment) {
+  AddCurrentDescriptor(kind, deopt_id, token_pos);
+  RecordSafepoint(locs);
+  if (deopt_id != Isolate::kNoDeoptId) {
+    // 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 (is_optimizing()) {
+      AddDeoptIndexAtCall(deopt_id_after, token_pos, input_count_adjustment);
+    } else {
+      // Add deoptimization continuation point after the call and before the
+      // arguments are removed.
+      AddCurrentDescriptor(RawPcDescriptors::kDeopt, deopt_id_after, token_pos);
+    }
+  }
+}
+
+
 void FlowGraphCompiler::GenerateInstanceCall(
     intptr_t deopt_id,
     intptr_t token_pos,
     intptr_t argument_count,
     LocationSummary* locs,
     const ICData& ic_data) {
   ASSERT(!ic_data.IsNull());
   ASSERT(FLAG_propagate_ic_data || (ic_data.NumberOfUsedChecks() == 0));
   uword label_address = 0;
   StubCode* stub_code = isolate()->stub_code();
@@ skipping 585 matching lines @@
     threshold = FLAG_optimization_counter_scale * basic_blocks +
         FLAG_min_optimization_counter_threshold;
     if (threshold > FLAG_optimization_counter_threshold) {
       threshold = FLAG_optimization_counter_threshold;
     }
   }
   return threshold;
 }
 
 }  // namespace dart