Refactor emitting of deoptimization descriptors for calls.

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
@@ skipping 2252 matching lines @@
                                    Scanner::kNoSourcePos);
   }
   if (HasParallelMove()) {
     compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
   }
 }
 
 
 LocationSummary* TargetEntryInstr::MakeLocationSummary(Isolate* isolate,
                                                        bool optimizing) const {
-  // FlowGraphCompiler::EmitInstructionPrologue is not called for block
-  // entry instructions, so this function is unused.  If it becomes
-  // reachable, note that the deoptimization descriptor in unoptimized code
-  // comes after the point of local register allocation due to pattern
-  // matching the edge counter code backwards (as a code reuse convenience
-  // on some platforms).
   UNREACHABLE();
   return NULL;
 }
 
 
+void TargetEntryInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+  __ Bind(compiler->GetJumpLabel(this));
+  if (!compiler->is_optimizing()) {
+    if (compiler->NeedsEdgeCounter(this)) {
+      compiler->EmitEdgeCounter();
+    }
+    // The deoptimization descriptor points after the edge counter code for
+    // uniformity with ARM and MIPS, where we can reuse pattern matching
+    // code that matches backwards from the end of the pattern.
+    compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
+                                   deopt_id_,
+                                   Scanner::kNoSourcePos);
+  }
+  if (HasParallelMove()) {
+    compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
+  }
+}
+
+
 LocationSummary* PhiInstr::MakeLocationSummary(Isolate* isolate,
                                                bool optimizing) const {
   UNREACHABLE();
   return NULL;
 }
 
 
 void PhiInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   UNREACHABLE();
 }
@@ skipping 212 matching lines @@
       // Call was not visited yet, use original ICData in order to populate it.
       compiler->GenerateInstanceCall(deopt_id(),
                                      token_pos(),
                                      ArgumentCount(),
                                      locs(),
                                      *call_ic_data);
     }
   } else {
     // Unoptimized code.
     ASSERT(!HasICData());
-    compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
-                                   deopt_id(),
-                                   token_pos());
     bool is_smi_two_args_op = false;
     const uword label_address = TwoArgsSmiOpInlineCacheEntry(token_kind());
     if (label_address != 0) {
       // We have a dedicated inline cache stub for this operation, add an
       // an initial Smi/Smi check with count 0.
       ASSERT(call_ic_data->NumArgsTested() == 2);
       const String& name = String::Handle(isolate, call_ic_data->target_name());
       const Class& smi_class = Class::Handle(isolate, Smi::Class());
       const Function& smi_op_target =
           Function::Handle(Resolver::ResolveDynamicAnyArgs(smi_class, name));
@@ skipping 77 matching lines @@
       default:
         break;
     }
     call_ic_data = compiler->GetOrAddStaticCallICData(deopt_id(),
                                                       function(),
                                                       arguments_descriptor,
                                                       num_args_checked);
   } else {
     call_ic_data = &ICData::ZoneHandle(ic_data()->raw());
   }
-  if (!compiler->is_optimizing()) {
-    // Some static calls can be optimized by the optimizing compiler (e.g. sqrt)
-    // and therefore need a deoptimization descriptor.
-    compiler->AddCurrentDescriptor(RawPcDescriptors::kDeopt,
-                                   deopt_id(),
-                                   token_pos());
-  }
   compiler->GenerateStaticCall(deopt_id(),
                                token_pos(),
                                function(),
                                ArgumentCount(),
                                argument_names(),
                                locs(),
                                *call_ic_data);
 }
 
 
@@ skipping 459 matching lines @@
     case Token::kTRUNCDIV: return 0;
     case Token::kMOD: return 1;
     default: UNIMPLEMENTED(); return -1;
   }
 }
 
 
 #undef __
 
 }  // namespace dart