Reapply "Lazy deopt without code patching."

runtime/vm/isolate.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_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/atomic.h"
 #include "vm/base_isolate.h"
 #include "vm/class_table.h"
 #include "vm/handles.h"
 #include "vm/megamorphic_cache_table.h"
 #include "vm/metrics.h"
 #include "vm/random.h"
 #include "vm/tags.h"
 #include "vm/thread.h"
 #include "vm/os_thread.h"
 #include "vm/timer.h"
 #include "vm/token_position.h"
+#include "vm/growable_array.h"
 
 namespace dart {
 
 // Forward declarations.
 class ApiState;
 class BackgroundCompiler;
 class Capability;
 class CodeIndexTable;
 class CompilerStats;
 class Debugger;
@@ skipping 31 matching lines @@
 class ServiceIdZone;
 class Simulator;
 class StackResource;
 class StackZone;
 class StoreBuffer;
 class StubCode;
 class ThreadRegistry;
 class UserTag;
 
 
+class PendingLazyDeopt {
+ public:
+  PendingLazyDeopt(uword fp, uword pc) : fp_(fp), pc_(pc) { }
+  uword fp() { return fp_; }
+  uword pc() { return pc_; }
+  void set_pc(uword pc) { pc_ = pc; }
+
+ private:
+  uword fp_;
+  uword pc_;
+};
+
+
 class IsolateVisitor {
  public:
   IsolateVisitor() {}
   virtual ~IsolateVisitor() {}
 
   virtual void VisitIsolate(Isolate* isolate) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(IsolateVisitor);
 };
@@ skipping 300 matching lines @@
     return shutdown_callback_;
   }
 
   void set_object_id_ring(ObjectIdRing* ring) {
     object_id_ring_ = ring;
   }
   ObjectIdRing* object_id_ring() {
     return object_id_ring_;
   }
 
+  MallocGrowableArray<PendingLazyDeopt>* pending_deopts() {
+    return pending_deopts_;
+  }
   bool IsDeoptimizing() const { return deopt_context_ != NULL; }
   DeoptContext* deopt_context() const { return deopt_context_; }
   void set_deopt_context(DeoptContext* value) {
     ASSERT(value == NULL || deopt_context_ == NULL);
     deopt_context_ = value;
   }
 
   BackgroundCompiler* background_compiler() const {
     return background_compiler_;
   }
@@ skipping 330 matching lines @@
   Mutex* symbols_mutex_;  // Protects concurrent access to the symbol table.
   Mutex* type_canonicalization_mutex_;  // Protects type canonicalization.
   Mutex* constant_canonicalization_mutex_;  // Protects const canonicalization.
   Mutex* megamorphic_lookup_mutex_;  // Protects megamorphic table lookup.
   MessageHandler* message_handler_;
   IsolateSpawnState* spawn_state_;
   bool is_runnable_;
   Dart_GcPrologueCallback gc_prologue_callback_;
   Dart_GcEpilogueCallback gc_epilogue_callback_;
   intptr_t defer_finalization_count_;
+  MallocGrowableArray<PendingLazyDeopt>* pending_deopts_;
   DeoptContext* deopt_context_;
 
   bool is_service_isolate_;
 
   // Isolate-specific flags.
   NOT_IN_PRODUCT(
     bool type_checks_;
     bool asserts_;
     bool error_on_bad_type_;
     bool error_on_bad_override_;
@@ skipping 237 matching lines @@
   intptr_t* spawn_count_;
 
   Dart_IsolateFlags isolate_flags_;
   bool paused_;
   bool errors_are_fatal_;
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_