Move phase_zone from CompilationInfo to CompilationPhase.

src/compiler.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 39 matching lines @@
 struct OffsetRange {
   OffsetRange(int from, int to) : from(from), to(to) {}
   int from;
   int to;
 };
 
 // CompilationInfo encapsulates some information known at compile time.  It
 // is constructed based on the resources available at compile-time.
 class CompilationInfo {
  public:
-  CompilationInfo(Handle<JSFunction> closure, Zone* zone, Zone* phase_zone);
+  CompilationInfo(Handle<JSFunction> closure, Zone* zone);
   virtual ~CompilationInfo();
 
   Isolate* isolate() {
     ASSERT(Isolate::Current() == isolate_);
     return isolate_;
   }
   Zone* zone() { return zone_; }
-  Zone* phase_zone() { return phase_zone_; }
   bool is_lazy() const { return IsLazy::decode(flags_); }
   bool is_eval() const { return IsEval::decode(flags_); }
   bool is_global() const { return IsGlobal::decode(flags_); }
   bool is_classic_mode() const { return language_mode() == CLASSIC_MODE; }
   bool is_extended_mode() const { return language_mode() == EXTENDED_MODE; }
   LanguageMode language_mode() const {
     return LanguageModeField::decode(flags_);
   }
   bool is_in_loop() const { return IsInLoop::decode(flags_); }
   FunctionLiteral* function() const { return function_; }
@@ skipping 217 matching lines @@
   void AbortDueToDependencyChange() {
     mode_ = DEPENDENCY_CHANGE_ABORT;
   }
 
   bool HasAbortedDueToDependencyChange() {
     return mode_ == DEPENDENCY_CHANGE_ABORT;
   }
 
  protected:
   CompilationInfo(Handle<Script> script,
-                  Zone* zone,
-                  Zone* phase_zone);
+                  Zone* zone);
   CompilationInfo(Handle<SharedFunctionInfo> shared_info,
-                  Zone* zone,
-                  Zone* phase_zone);
+                  Zone* zone);
   CompilationInfo(HydrogenCodeStub* stub,
                   Isolate* isolate,
-                  Zone* zone,
-                  Zone* phase_zone);
+                  Zone* zone);
 
  private:
   Isolate* isolate_;
 
   // Compilation mode.
   // BASE is generated by the full codegen, optionally prepared for bailouts.
   // OPTIMIZE is optimized code generated by the Hydrogen-based backend.
   // NONOPT is generated by the full codegen and is not prepared for
   //   recompilation/bailouts.  These functions are never recompiled.
   enum Mode {
     BASE,
     OPTIMIZE,
     NONOPT,
     STUB,
     DEPENDENCY_CHANGE_ABORT
   };
 
-  void Initialize(Isolate* isolate, Mode mode, Zone* zone, Zone* phase_zone);
+  void Initialize(Isolate* isolate, Mode mode, Zone* zone);
 
   void SetMode(Mode mode) {
     ASSERT(V8::UseCrankshaft());
     mode_ = mode;
   }
 
   // Flags using template class BitField<type, start, length>.  All are
   // false by default.
   //
   // Compilation is either eager or lazy.
@@ skipping 53 matching lines @@
   // global script. Will be a null handle otherwise.
   Handle<Context> context_;
 
   // Compilation mode flag and whether deoptimization is allowed.
   Mode mode_;
   BailoutId osr_ast_id_;
 
   // The zone from which the compilation pipeline working on this
   // CompilationInfo allocates.
   Zone* zone_;
-  // The phase zone where allocations local to a specific phase are
-  // performed; be aware that this zone is cleared after each phase
-  Zone* phase_zone_;
 
   DeferredHandles* deferred_handles_;
 
   ZoneList<Handle<HeapObject> >* dependencies_[DependentCode::kGroupCount];
 
   template<typename T>
   void SaveHandle(Handle<T> *object) {
     if (!object->is_null()) {
       Handle<T> handle(*(*object));
       *object = handle;
@@ skipping 14 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(CompilationInfo);
 };
 
 
 // Exactly like a CompilationInfo, except also creates and enters a
 // Zone on construction and deallocates it on exit.
 class CompilationInfoWithZone: public CompilationInfo {
  public:
   explicit CompilationInfoWithZone(Handle<Script> script)
-      : CompilationInfo(script, &zone_, &phase_zone_),
-        zone_(script->GetIsolate()),
-        phase_zone_(script->GetIsolate()) {}
+      : CompilationInfo(script, &zone_),
+        zone_(script->GetIsolate()) {}
   explicit CompilationInfoWithZone(Handle<SharedFunctionInfo> shared_info)
-      : CompilationInfo(shared_info, &zone_, &phase_zone_),
-        zone_(shared_info->GetIsolate()),
-        phase_zone_(shared_info->GetIsolate()) {}
+      : CompilationInfo(shared_info, &zone_),
+        zone_(shared_info->GetIsolate()) {}
   explicit CompilationInfoWithZone(Handle<JSFunction> closure)
-      : CompilationInfo(closure, &zone_, &phase_zone_),
-        zone_(closure->GetIsolate()),
-        phase_zone_(closure->GetIsolate()) {}
+      : CompilationInfo(closure, &zone_),
+        zone_(closure->GetIsolate()) {}
   CompilationInfoWithZone(HydrogenCodeStub* stub, Isolate* isolate)
-      : CompilationInfo(stub, isolate, &zone_, &phase_zone_),
-        zone_(isolate),
-        phase_zone_(isolate) {}
+      : CompilationInfo(stub, isolate, &zone_),
+        zone_(isolate) {}
 
   // Virtual destructor because a CompilationInfoWithZone has to exit the
   // zone scope and get rid of dependent maps even when the destructor is
   // called when cast as a CompilationInfo.
   virtual ~CompilationInfoWithZone() {
     RollbackDependencies();
   }
 
  private:
   Zone zone_;
-  Zone phase_zone_;
 };
 
 
 // A wrapper around a CompilationInfo that detaches the Handles from
 // the underlying DeferredHandleScope and stores them in info_ on
 // destruction.
 class CompilationHandleScope BASE_EMBEDDED {
  public:
   explicit CompilationHandleScope(CompilationInfo* info)
       : deferred_(info->isolate()), info_(info) {}
@@ skipping 145 matching lines @@
 #endif
 
   static void RecordFunctionCompilation(Logger::LogEventsAndTags tag,
                                         CompilationInfo* info,
                                         Handle<SharedFunctionInfo> shared);
 };
 
 
 class CompilationPhase BASE_EMBEDDED {
  public:
-  CompilationPhase(const char* name, Isolate* isolate, Zone* zone);
+  CompilationPhase(const char* name, CompilationInfo* info);
   ~CompilationPhase();
 
  protected:
   bool ShouldProduceTraceOutput() const;
 
   const char* name() const { return name_; }
-  Isolate* isolate() const { return isolate_; }
-  Zone* zone() const { return zone_; }
+  Isolate* isolate() const { return info_->isolate(); }
+  Zone* zone() { return &zone_; }
 
  private:
   const char* name_;
-  Isolate* isolate_;
-  Zone* zone_;
-  unsigned start_allocation_size_;
+  CompilationInfo* info_;
+  Zone zone_;
+  unsigned info_zone_start_allocation_size_;
   int64_t start_ticks_;
 
   DISALLOW_COPY_AND_ASSIGN(CompilationPhase);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_COMPILER_H_