Emit kDeoptBefore only in unoptimzied code (target when switching from optimized to unoptimized cod…

runtime/vm/intermediate_language.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/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 1450 matching lines @@
 
 
 LocationSummary* GotoInstr::MakeLocationSummary() const {
   return new LocationSummary(0, 0, LocationSummary::kNoCall);
 }
 
 
 void GotoInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   // Add deoptimization descriptor for deoptimizing instructions
   // that may be inserted before this instruction.
-  compiler->AddCurrentDescriptor(PcDescriptors::kDeoptBefore,
-                                 GetDeoptId(),
-                                 0);  // No token position.
+  if (!compiler->is_optimizing()) {
+    compiler->AddCurrentDescriptor(PcDescriptors::kDeoptBefore,
+                                   GetDeoptId(),
+                                   0);  // No token position.
+  }
 
   if (HasParallelMove()) {
     compiler->parallel_move_resolver()->EmitNativeCode(parallel_move());
   }
 
   // We can fall through if the successor is the next block in the list.
   // Otherwise, we need a jump.
   if (!compiler->IsNextBlock(successor())) {
     __ jmp(compiler->GetBlockLabel(successor()));
   }
@@ skipping 128 matching lines @@
   __ Drop(argument_count);
 }
 
 
 LocationSummary* InstanceCallInstr::MakeLocationSummary() const {
   return MakeCallSummary();
 }
 
 
 void InstanceCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  compiler->AddCurrentDescriptor(PcDescriptors::kDeoptBefore,
-                                 deopt_id(),
-                                 token_pos());
+  if (!compiler->is_optimizing()) {
+    compiler->AddCurrentDescriptor(PcDescriptors::kDeoptBefore,
+                                   deopt_id(),
+                                   token_pos());
+  }
   compiler->GenerateInstanceCall(deopt_id(),
                                  token_pos(),
                                  function_name(),
                                  ArgumentCount(),
                                  argument_names(),
                                  checked_argument_count(),
                                  locs());
 }
 
 
@@ skipping 361 matching lines @@
     new_max = new_max.Clamp();
   }
 
   return Range::Update(&range_, new_min, new_max);
 }
 
 
 #undef __
 
 }  // namespace dart