Eliminate excessive increment of deoptimization counters (e.g., with deep recursion of deoptimized …

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"
 #include "vm/deferred_objects.h"
 #include "vm/growable_array.h"
 #include "vm/locations.h"
 #include "vm/object.h"
 #include "vm/thread.h"
 
 namespace dart {
 
 class Location;
 class Value;
 class MaterializeObjectInstr;
 class StackFrame;
 class TimelineEvent;
 
 // Holds all data relevant for execution of deoptimization instructions.
+// Structure is allocated in C-heap.
 class DeoptContext {
  public:
   enum DestFrameOptions {
     kDestIsOriginalFrame,   // Replace the original frame with deopt frame.
     kDestIsAllocated        // Write deopt frame to a buffer.
   };
 
+  // If 'deoptimizing_code' is false, only frame is being deoptimized.
   DeoptContext(const StackFrame* frame,
                const Code& code,
                DestFrameOptions dest_options,
                fpu_register_t* fpu_registers,
                intptr_t* cpu_registers,
-               bool is_lazy_deopt);
+               bool is_lazy_deopt,
+               bool deoptimizing_code);
   virtual ~DeoptContext();
 
   // Returns the offset of the dest fp from the dest sp.  Used in
   // runtime code to adjust the stack size before deoptimization.
   intptr_t DestStackAdjustment() const;
 
   intptr_t* GetSourceFrameAddressAt(intptr_t index) const {
     ASSERT(source_frame_ != NULL);
     ASSERT((0 <= index) && (index < source_frame_size_));
     return &source_frame_[index];
@@ skipping 41 matching lines @@
   Thread* thread() const { return thread_; }
   Zone* zone() const { return thread_->zone(); }
 
   intptr_t source_frame_size() const { return source_frame_size_; }
   intptr_t dest_frame_size() const { return dest_frame_size_; }
 
   RawCode* code() const { return code_; }
 
   bool is_lazy_deopt() const { return is_lazy_deopt_; }
 
+  bool deoptimizing_code() const { return deoptimizing_code_; }
+
   ICData::DeoptReasonId deopt_reason() const { return deopt_reason_; }
   bool HasDeoptFlag(ICData::DeoptFlags flag) {
     return (deopt_flags_ & flag) != 0;
   }
 
   RawTypedData* deopt_info() const { return deopt_info_; }
 
   // Fills the destination frame but defers materialization of
   // objects.
   void FillDestFrame();
@@ skipping 115 matching lines @@
   intptr_t caller_fp_;
   Thread* thread_;
   int64_t deopt_start_micros_;
 
   DeferredSlot* deferred_slots_;
 
   intptr_t deferred_objects_count_;
   DeferredObject** deferred_objects_;
 
   const bool is_lazy_deopt_;
+  const bool deoptimizing_code_;
 
   DISALLOW_COPY_AND_ASSIGN(DeoptContext);
 };
 
 
 
 // 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 {
@@ skipping 295 matching lines @@
   class ReasonField : public BitField<ICData::DeoptReasonId, 0, 8> { };
   class FlagsField : public BitField<uint32_t, 8, 8> { };
 
  private:
   static const intptr_t kEntrySize = 3;
 };
 
 }  // namespace dart
 
 #endif  // VM_DEOPT_INSTRUCTIONS_H_