Inline the StackResource constructor/destructor.

vm/isolate.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_ISOLATE_H_
 #define VM_ISOLATE_H_
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "platform/thread.h"
+#include "vm/base_isolate.h"
 #include "vm/gc_callbacks.h"
 #include "vm/store_buffer.h"
 #include "vm/timer.h"
 
 namespace dart {
 
 // Forward declarations.
 class ApiState;
 class CodeIndexTable;
 class Debugger;
 class HandleScope;
 class HandleVisitor;
 class Heap;
 class LongJump;
 class MessageHandler;
 class Mutex;
 class ObjectPointerVisitor;
 class ObjectStore;
 class RawContext;
 class RawError;
 class StackResource;
 class StubCode;
 class Zone;
 
 
-class Isolate {
+class Isolate : public BaseIsolate {
  public:
   ~Isolate();
 
   static inline Isolate* Current() {
     return reinterpret_cast<Isolate*>(Thread::GetThreadLocal(isolate_key));
   }
 
   static void SetCurrent(Isolate* isolate);
 
   static void InitOnce();
@@ skipping 29 matching lines @@
   Heap* heap() const { return heap_; }
   void set_heap(Heap* value) { heap_ = value; }
   static intptr_t heap_offset() { return OFFSET_OF(Isolate, heap_); }
 
   ObjectStore* object_store() const { return object_store_; }
   void set_object_store(ObjectStore* value) { object_store_ = value; }
   static intptr_t object_store_offset() {
     return OFFSET_OF(Isolate, object_store_);
   }
 
-  StackResource* top_resource() const { return top_resource_; }
-  void set_top_resource(StackResource* value) { top_resource_ = value; }
-
   RawContext* top_context() const { return top_context_; }
   void set_top_context(RawContext* value) { top_context_ = value; }
   static intptr_t top_context_offset() {
     return OFFSET_OF(Isolate, top_context_);
   }
 
   int32_t random_seed() const { return random_seed_; }
   void set_random_seed(int32_t value) { random_seed_ = value; }
 
   uword top_exit_frame_info() const { return top_exit_frame_info_; }
@@ skipping 11 matching lines @@
   CodeIndexTable* code_index_table() const { return code_index_table_; }
   void set_code_index_table(CodeIndexTable* value) {
     code_index_table_ = value;
   }
 
   LongJump* long_jump_base() const { return long_jump_base_; }
   void set_long_jump_base(LongJump* value) { long_jump_base_ = value; }
 
   TimerList& timer_list() { return timer_list_; }
 
-  Zone* current_zone() const { return current_zone_; }
-  void set_current_zone(Zone* zone) { current_zone_ = zone; }
   static intptr_t current_zone_offset() {
     return OFFSET_OF(Isolate, current_zone_);
   }
 
-  int32_t no_gc_scope_depth() const {
-#if defined(DEBUG)
-    return no_gc_scope_depth_;
-#else
-    return 0;
-#endif
-  }
-
-  void IncrementNoGCScopeDepth() {
-#if defined(DEBUG)
-    ASSERT(no_gc_scope_depth_ < INT_MAX);
-    no_gc_scope_depth_ += 1;
-#endif
-  }
-
-  void DecrementNoGCScopeDepth() {
-#if defined(DEBUG)
-    ASSERT(no_gc_scope_depth_ > 0);
-    no_gc_scope_depth_ -= 1;
-#endif
-  }
-
-  int32_t no_handle_scope_depth() const {
-#if defined(DEBUG)
-    return no_handle_scope_depth_;
-#else
-    return 0;
-#endif
-  }
-
-  void IncrementNoHandleScopeDepth() {
-#if defined(DEBUG)
-    ASSERT(no_handle_scope_depth_ < INT_MAX);
-    no_handle_scope_depth_ += 1;
-#endif
-  }
-
-  void DecrementNoHandleScopeDepth() {
-#if defined(DEBUG)
-    ASSERT(no_handle_scope_depth_ > 0);
-    no_handle_scope_depth_ -= 1;
-#endif
-  }
-
-  HandleScope* top_handle_scope() const {
-#if defined(DEBUG)
-    return top_handle_scope_;
-#else
-    return 0;
-#endif
-  }
-
-  void set_top_handle_scope(HandleScope* handle_scope) {
-#if defined(DEBUG)
-    top_handle_scope_ = handle_scope;
-#endif
-  }
-
   void set_init_callback_data(void* value) {
     init_callback_data_ = value;
   }
   void* init_callback_data() const {
     return init_callback_data_;
   }
 
   Dart_LibraryTagHandler library_tag_handler() const {
     return library_tag_handler_;
   }
@@ skipping 62 matching lines @@
   static const uword kStackSizeBuffer = (128 * KB);
   static const uword kDefaultStackSize = (1 * MB);
 
   static ThreadLocalKey isolate_key;
   StoreBufferBlock store_buffer_;
   Dart_MessageNotifyCallback message_notify_callback_;
   char* name_;
   Dart_Port main_port_;
   Heap* heap_;
   ObjectStore* object_store_;
-  StackResource* top_resource_;
   RawContext* top_context_;
-  Zone* current_zone_;
-#if defined(DEBUG)
-  int32_t no_gc_scope_depth_;
-  int32_t no_handle_scope_depth_;
-  HandleScope* top_handle_scope_;
-#endif
   int32_t random_seed_;
   uword top_exit_frame_info_;
   void* init_callback_data_;
   Dart_LibraryTagHandler library_tag_handler_;
   ApiState* api_state_;
   StubCode* stub_code_;
   CodeIndexTable* code_index_table_;
   Debugger* debugger_;
   LongJump* long_jump_base_;
   TimerList timer_list_;
   intptr_t ast_node_id_;
   Mutex* mutex_;  // protects stack_limit_ and saved_stack_limit_.
   uword stack_limit_;
   uword saved_stack_limit_;
   MessageHandler* message_handler_;
   GcPrologueCallbacks gc_prologue_callbacks_;
   GcEpilogueCallbacks gc_epilogue_callbacks_;
 
   static Dart_IsolateCreateCallback create_callback_;
   static Dart_IsolateInterruptCallback interrupt_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(Isolate);
 };
 
 }  // namespace dart
 
 #endif  // VM_ISOLATE_H_