First round of size reduction for JumpTargets. Reduce their size by...

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 38 matching lines @@
 // 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 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

[William Hesse, 2009/05/18 12:18:24]

This comment should be changed.

   // code and to provide access to a current frame.
-  explicit JumpTarget(CodeGenerator* cgen,
-                      Directionality direction = FORWARD_ONLY);
+  explicit JumpTarget(Directionality direction)
+      : direction_(direction),
+        reaching_frames_(0),
+        merge_labels_(0),
+        entry_frame_(NULL) {
+  }
 
   // Construct a jump target without a code generator.  A code

[William Hesse, 2009/05/18 12:18:24]

This comment should be changed.

   // 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();
+  JumpTarget()
+      : direction_(FORWARD_ONLY),
+        reaching_frames_(0),
+        merge_labels_(0),
+        entry_frame_(NULL) {
+  }
 
   virtual ~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);
+  // Set the direction of the jump target.
+  virtual void set_direction(Directionality direction) {
+    direction_ = direction;
+  }
 
   // Treat the jump target as a fresh one.  The state is reset.
   void Unuse();
 
-  // Accessors.
-  CodeGenerator* code_generator() const { return cgen_; }
+  inline CodeGenerator* cgen();
 
   Label* entry_label() { return &entry_label_; }
 
   VirtualFrame* entry_frame() const { return entry_frame_; }
   void set_entry_frame(VirtualFrame* frame) {
     entry_frame_ = frame;
   }
 
   // Predicates testing the state of the encapsulated label.
   bool is_bound() const { return entry_label_.is_bound(); }
@@ skipping 62 matching lines @@
   // after the call is the same as the frame before the call.
   void Call();
 
   static const int kAllElements = -1;  // Not a valid number of elements.
 
   static void set_compiling_deferred_code(bool flag) {
     compiling_deferred_code_ = flag;
   }
 
  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 list of frames reaching this block via forward jumps.
   ZoneList<VirtualFrame*> reaching_frames_;
 
   // A parallel list of labels for merge code.
   ZoneList<Label> merge_labels_;
 
   // The frame used on entry to the block and expected at backward
@@ skipping 43 matching lines @@
 class BreakTarget : public JumpTarget {
  public:
   // Construct a break target without a code generator.  A code
   // generator must be supplied before using the break target as a
   // label.  This is useful, eg, when break targets are embedded in AST
   // nodes.
   BreakTarget() {}
 
   virtual ~BreakTarget() {}
 
-  // Supply a code generator, expected expression stack height, and
-  // directionality to an already constructed break 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);
+  // Set the direction of the break target.
+  virtual void set_direction(Directionality direction);
 
   // Copy the state of this break target to the destination.  The
   // lists of forward-reaching frames and merge-point labels are
   // copied.  All virtual frame pointers are copied, not the
   // pointed-to frames.  The previous state of the destination is
   // overwritten, without deallocating pointed-to virtual frames.
   void CopyTo(BreakTarget* destination);
 
   // Emit a jump to the target.  There must be a current frame at the
   // jump and there will be no current frame after the jump.
@@ skipping 63 matching lines @@
   bool is_shadowing_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ShadowTarget);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_JUMP_TARGET_H_