Ensure that all goto instructions have deoptimization target.

runtime/vm/deopt_instructions.h

 // 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.
 
 #ifndef VM_DEOPT_INSTRUCTIONS_H_
 #define VM_DEOPT_INSTRUCTIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
@@ skipping 77 matching lines @@
 };
 
 
 
 // Represents one deopt instruction, e.g, setup return address, store object,
 // store register, etc. The target is defined by instruction's position in
 // the deopt-info array.
 class DeoptInstr : public ZoneAllocated {
  public:
   enum Kind {
-    kRetAfterAddress,
-    kRetBeforeAddress,
+    kRetAddress,
     kConstant,
     kRegister,
     kFpuRegister,
     kInt64FpuRegister,
     kFloat32x4FpuRegister,
     kUint32x4FpuRegister,
     kStackSlot,
     kDoubleStackSlot,
     kInt64StackSlot,
     kFloat32x4StackSlot,
@@ skipping 19 matching lines @@
   bool Equals(const DeoptInstr& other) const {
     return (kind() == other.kind()) && (from_index() == other.from_index());
   }
 
   // Decode the payload of a suffix command.  Return the suffix length and
   // set the output parameter info_number to the index of the shared suffix.
   static intptr_t DecodeSuffix(intptr_t from_index, intptr_t* info_number);
 
   // Get the function and return address which is encoded in this
   // kRetAfterAddress deopt instruction.
-  static uword GetRetAfterAddress(DeoptInstr* instr,
-                                  const Array& object_table,
-                                  Function* func);
+  static uword GetRetAddress(DeoptInstr* instr,
+                             const Array& object_table,
+                             Function* func);
 
  protected:
   virtual intptr_t from_index() const = 0;
 
   friend class DeoptInfoBuilder;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DeoptInstr);
 };
 
 
 // Builds a deoptimization info table, one DeoptInfo at a time.  Call AddXXX
 // methods in the order of their target, starting wih deoptimized code
 // continuation pc and ending with the first argument of the deoptimized
 // code.  Call CreateDeoptInfo to write the accumulated instructions into
 // the heap and reset the builder's internal state for the next DeoptInfo.
 class DeoptInfoBuilder : public ValueObject {
  public:
   explicit DeoptInfoBuilder(const intptr_t num_args);
 
   // 'object_table' holds all objects referred to by DeoptInstr in
   // all DeoptInfo instances for a single Code object.
   const GrowableObjectArray& object_table() { return object_table_; }
 
   // Return address before instruction.
-  void AddReturnAddressBefore(const Function& function,
-                              intptr_t deopt_id,
-                              intptr_t to_index);
-
-  // Return address after instruction.
-  void AddReturnAddressAfter(const Function& function,
-                             intptr_t deopt_id,
-                             intptr_t to_index);
+  void AddReturnAddress(const Function& function,
+                        intptr_t deopt_id,
+                        intptr_t to_index);
 
   // Copy from optimized frame to unoptimized.
   void AddCopy(const Location& from_loc, intptr_t to_index);
   void AddPcMarker(const Function& function, intptr_t to_index);
   void AddCallerFp(intptr_t to_index);
   void AddCallerPc(intptr_t to_index);
 
   RawDeoptInfo* CreateDeoptInfo();
 
  private:
@@ skipping 40 matching lines @@
                        DeoptInfo* info,
                        Smi* reason);
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_