Ensure that all goto instructions have deoptimization target.

runtime/vm/flow_graph_compiler.h

 // 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.
 
 #ifndef VM_FLOW_GRAPH_COMPILER_H_
 #define VM_FLOW_GRAPH_COMPILER_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_descriptors.h"
@@ skipping 63 matching lines @@
 
   RawDeoptInfo* CreateDeoptInfo(FlowGraphCompiler* compiler,
                                 DeoptInfoBuilder* builder);
 
   void AllocateIncomingParametersRecursive(Environment* env,
                                            intptr_t* stack_height);
 
   // No code needs to be generated.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix) {}
 
-  // Builds deopt-after continuation point.
-  virtual void BuildReturnAddress(DeoptInfoBuilder* builder,
-                                  const Function& function,
-                                  intptr_t slot_ix);
-
   intptr_t pc_offset() const { return pc_offset_; }
   void set_pc_offset(intptr_t offset) { pc_offset_ = offset; }
 
   intptr_t deopt_id() const { return deopt_id_; }
 
   DeoptReasonId reason() const { return reason_; }
 
   const Environment* deoptimization_env() const { return deoptimization_env_; }
   void set_deoptimization_env(Environment* env) { deoptimization_env_ = env; }
 
@@ skipping 13 matching lines @@
                             DeoptReasonId reason)
       : CompilerDeoptInfo(deopt_id, reason), entry_label_() {
     ASSERT(reason != kDeoptAtCall);
   }
 
   Label* entry_label() { return &entry_label_; }
 
   // Implementation is in architecture specific file.
   virtual void GenerateCode(FlowGraphCompiler* compiler, intptr_t stub_ix);
 
-  // Builds deopt-before continuation point.
-  virtual void BuildReturnAddress(DeoptInfoBuilder* builder,
-                                  const Function& function,
-                                  intptr_t slot_ix);
-
  private:
   Label entry_label_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilerDeoptInfoWithStub);
 };
 
 
 class SlowPathCode : public ZoneAllocated {
  public:
   SlowPathCode() : entry_label_(), exit_label_() { }
@@ skipping 120 matching lines @@
                         PcDescriptors::Kind kind,
                         LocationSummary* locs);
 
   void GenerateAssertAssignable(intptr_t token_pos,
                                 intptr_t deopt_id,
                                 const AbstractType& dst_type,
                                 const String& dst_name,
                                 LocationSummary* locs);
 
   void GenerateInstanceOf(intptr_t token_pos,
-                          intptr_t deopt_id,

[Florian Schneider, 2013/04/12 09:23:55]

Why remove deopt_id here?

[Vyacheslav Egorov (Google), 2013/04/12 10:57:06]

Reinstated.

                           const AbstractType& type,
                           bool negate_result,
                           LocationSummary* locs);
 
   void GenerateInstanceCall(intptr_t deopt_id,
                             intptr_t token_pos,
                             intptr_t argument_count,
                             const Array& argument_names,
                             LocationSummary* locs,
                             const ICData& ic_data);
@@ skipping 269 matching lines @@
   // that should be used when deoptimizing we store it in this variable.
   // In future AddDeoptStub should be moved out of the instruction template.
   Environment* pending_deoptimization_env_;
 
   DISALLOW_COPY_AND_ASSIGN(FlowGraphCompiler);
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_COMPILER_H_