Add Zone-based handle allocation interface and reduce use of Isolate-based interfaces.

runtime/vm/parser.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_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
@@ skipping 22 matching lines @@
 struct CatchParamDesc;
 class ClassDesc;
 struct MemberDesc;
 struct ParamList;
 struct QualIdent;
 struct TopLevel;
 
 // The class ParsedFunction holds the result of parsing a function.
 class ParsedFunction : public ZoneAllocated {
  public:
-  ParsedFunction(Isolate* isolate, const Function& function)
-      : function_(function),
-        code_(Code::Handle(isolate, function.unoptimized_code())),
+  ParsedFunction(Thread* thread, const Function& function)
+      : thread_(thread),
+        function_(function),
+        code_(Code::Handle(zone(), function.unoptimized_code())),
         node_sequence_(NULL),
         regexp_compile_data_(NULL),
         instantiator_(NULL),
-        default_parameter_values_(Array::ZoneHandle(isolate, Array::null())),
+        default_parameter_values_(Array::ZoneHandle(zone(), Array::null())),
         current_context_var_(NULL),
         expression_temp_var_(NULL),
         finally_return_temp_var_(NULL),
         deferred_prefixes_(new ZoneGrowableArray<const LibraryPrefix*>()),
         guarded_fields_(new ZoneGrowableArray<const Field*>()),
         first_parameter_index_(0),
         first_stack_local_index_(0),
         num_copied_params_(0),
         num_stack_locals_(0),
         have_seen_await_expr_(false),
         saved_try_ctx_(NULL),
-        async_saved_try_ctx_name_(String::ZoneHandle(isolate, String::null())),
-        isolate_(isolate) {
+        async_saved_try_ctx_name_(String::ZoneHandle(zone(), String::null())) {
     ASSERT(function.IsZoneHandle());
     // Every function has a local variable for the current context.
-    LocalVariable* temp = new(isolate) LocalVariable(
+    LocalVariable* temp = new(zone()) LocalVariable(
         function.token_pos(),
         Symbols::CurrentContextVar(),
-        Type::ZoneHandle(isolate, Type::DynamicType()));
+        Type::ZoneHandle(zone(), Type::DynamicType()));
     ASSERT(temp != NULL);
     current_context_var_ = temp;
   }
 
   const Function& function() const { return function_; }
   const Code& code() const { return code_; }
 
   SequenceNode* node_sequence() const { return node_sequence_; }
   void SetNodeSequence(SequenceNode* node_sequence);
 
@@ skipping 84 matching lines @@
   }
   RawString* async_saved_try_ctx_name() const {
     return async_saved_try_ctx_name_.raw();
   }
 
   void reset_saved_try_ctx_vars() {
     saved_try_ctx_ = NULL;
     async_saved_try_ctx_name_ = String::null();
   }
 
-  Isolate* isolate() const { return isolate_; }
+  Thread* thread() const { return thread_; }
+  Isolate* isolate() const { return thread()->isolate(); }
+  Zone* zone() const { return thread()->zone(); }
 
  private:
+  Thread* thread_;
   const Function& function_;
   Code& code_;
   SequenceNode* node_sequence_;
   RegExpCompileData* regexp_compile_data_;
   LocalVariable* instantiator_;
   Array& default_parameter_values_;
   LocalVariable* current_context_var_;
   LocalVariable* expression_temp_var_;
   LocalVariable* finally_return_temp_var_;
   ZoneGrowableArray<const LibraryPrefix*>* deferred_prefixes_;
   ZoneGrowableArray<const Field*>* guarded_fields_;
 
   int first_parameter_index_;
   int first_stack_local_index_;
   int num_copied_params_;
   int num_stack_locals_;
   bool have_seen_await_expr_;
   LocalVariable* saved_try_ctx_;
   String& async_saved_try_ctx_name_;
 
-  Isolate* isolate_;
-
   friend class Parser;
   DISALLOW_COPY_AND_ASSIGN(ParsedFunction);
 };
 
 
 class Parser : public ValueObject {
  public:
   // Parse the top level of a whole script file and register declared classes
   // in the given library.
   static void ParseCompilationUnit(const Library& library,
@@ skipping 554 matching lines @@
       ArgumentListNode* arguments);
 
   void AddEqualityNullCheck();
 
   AstNode* BuildClosureCall(intptr_t token_pos,
                             AstNode* closure,
                             ArgumentListNode* arguments);
 
   RawInstance* TryCanonicalize(const Instance& instance, intptr_t token_pos);
 
-  Isolate* isolate() const { return isolate_; }
+  Thread* thread() const { return thread_; }
+  Isolate* isolate() const { return thread()->isolate(); }
+  Zone* zone() const { return thread()->zone(); }
 
-  Isolate* isolate_;  // Cached current isolate.
+  Thread* thread_;  // Cached current thread.
 
   Script& script_;
   TokenStream::Iterator tokens_iterator_;
   Token::Kind token_kind_;  // Cached token kind for current token.
   Block* current_block_;
 
   // is_top_level_ is true if parsing the "top level" of a compilation unit,
   // that is class definitions, function type aliases, global functions,
   // global variables.
   bool is_top_level_;
@@ skipping 42 matching lines @@
   bool unregister_pending_function_;
 
   LocalScope* async_temp_scope_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_