- Make VirtualFrame and JumpTarget zone allocated....

src/jump-target.h

 // Copyright 2008 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 34 matching lines @@
 // all forward-reaching paths.  When bound, an expected frame for the
 // block is determined and code is generated to merge to the expected
 // frame.  For backward jumps, the merge code is generated at the edge
 // leaving the predecessor block.
 //
 // A jump target must have been reached via control flow (either by
 // jumping, branching, or falling through) at the time it is bound.
 // In particular, this means that at least one of the control-flow
 // graph edges reaching the target must be a forward edge.
 
-class JumpTarget : public Malloced {  // Shadows are dynamically allocated.
+class JumpTarget : public ZoneObject {  // Shadows are dynamically allocated.
  public:
   // Forward-only jump targets can only be reached by forward CFG edges.
   enum Directionality { FORWARD_ONLY, BIDIRECTIONAL };
 
   // Construct a jump target with a given code generator used to generate
   // code and to provide access to a current frame.
   explicit JumpTarget(CodeGenerator* cgen,
                       Directionality direction = FORWARD_ONLY);
 
   // Construct a jump target without a code generator.  A code
   // generator must be supplied before using the jump target as a
   // label.  This is useful, eg, when break targets are embedded in
   // AST nodes.
   JumpTarget();
 
   // Supply a code generator and directionality to an already
   // constructed jump target.  This function expects to be given a
   // non-null code generator, and to be called only when the code
   // generator is not yet set.
   virtual void Initialize(CodeGenerator* cgen,
                           Directionality direction = FORWARD_ONLY);
 
-  virtual ~JumpTarget() { Unuse(); }
-
-  // Treat the jump target as a fresh one.  The state is reset and
-  // pointed-to virtual frames are deallocated.  There should be no
-  // dangling jumps to the target.
+  // Treat the jump target as a fresh one.  The state is reset.
   void Unuse();
 
-  // Reset the internal state of this jump target.  Pointed-to virtual
-  // frames are not deallocated and dangling jumps to the target are
-  // left dangling.
-  void Reset();
-
   // Accessors.
   CodeGenerator* code_generator() const { return cgen_; }
 
   Label* entry_label() { return &entry_label_; }
 
   VirtualFrame* entry_frame() const { return entry_frame_; }
   void set_entry_frame(VirtualFrame* frame) {
     entry_frame_ = frame;
   }
 
@@ skipping 68 matching lines @@
  protected:
   // The code generator gives access to its current frame.
   CodeGenerator* cgen_;
 
   // Used to emit code.
   MacroAssembler* masm_;
 
   // Directionality flag set at initialization time.
   Directionality direction_;
 
+  // A target is bound if its Bind member function has been called.
+  // It is linked if it is not bound but its Jump, Branch, or Call
+  // member functions have been called.
+  bool is_bound_;
+  bool is_linked_;
+
   // A list of frames reaching this block via forward jumps.
-  List<VirtualFrame*> reaching_frames_;
+  ZoneList<VirtualFrame*> reaching_frames_;
 
   // A parallel list of labels for merge code.
-  List<Label> merge_labels_;
+  ZoneList<Label> merge_labels_;
 
   // The frame used on entry to the block and expected at backward
   // jumps to the block.  Set when the jump target is bound, but may
   // or may not be set for forward-only blocks.
   VirtualFrame* entry_frame_;
 
   // The actual entry label of the block.
   Label entry_label_;
 
-  // A target is bound if its Bind member function has been called.
-  // It is linked if it is not bound but its Jump, Branch, or Call
-  // member functions have been called.
-  bool is_bound_;
-  bool is_linked_;
-
   // Implementations of Jump, Branch, and Bind with all arguments and
   // return values using the virtual frame.
   void DoJump();
   void DoBranch(Condition cc, Hint hint);
   void DoBind(int mergable_elements);
 
  private:
   static bool compiling_deferred_code_;
 
   // Add a virtual frame reaching this labeled block via a forward jump,
@@ skipping 81 matching lines @@
 // representing the formerly shadowing target.
 
 class ShadowTarget : public BreakTarget {
  public:
   // Construct a shadow jump target.  After construction the shadow
   // target object holds the state of the original target, and the
   // original target is actually a fresh one that intercepts control
   // flow intended for the shadowed one.
   explicit ShadowTarget(BreakTarget* shadowed);
 
-  virtual ~ShadowTarget() {
-    ASSERT(!is_shadowing_);
-  }
-
   // End shadowing.  After shadowing ends, the original jump target
   // again gives access to the formerly shadowed target and the shadow
   // target object gives access to the formerly shadowing target.
   void StopShadowing();
 
   // During shadowing, the currently shadowing target.  After
   // shadowing, the target that was shadowed.
   BreakTarget* other_target() const { return other_target_; }
 
  private:
   // During shadowing, the currently shadowing target.  After
   // shadowing, the target that was shadowed.
   BreakTarget* other_target_;
 
 #ifdef DEBUG
   bool is_shadowing_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ShadowTarget);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_JUMP_TARGET_H_