Clean up return statements in the code generator by explicitly...

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 87 matching lines @@
   }
 
   // Predicates testing the state of the encapsulated label.
   bool is_bound() const { return is_bound_; }
   bool is_linked() const { return is_linked_; }
   bool is_unused() const { return !is_bound() && !is_linked(); }
 
   // 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.
   virtual void Jump();
-  void Jump(Result* arg);
+  virtual void Jump(Result* arg);
   void Jump(Result* arg0, Result* arg1);
   void Jump(Result* arg0, Result* arg1, Result* arg2);
 
   // Emit a conditional branch to the target.  There must be a current
   // frame at the branch.  The current frame will fall through to the
   // code after the branch.
   virtual void Branch(Condition cc, Hint hint = no_hint);
-  void Branch(Condition cc, Result* arg, Hint hint = no_hint);
+  virtual void Branch(Condition cc, Result* arg, Hint hint = no_hint);
   void Branch(Condition cc, Result* arg0, Result* arg1, Hint hint = no_hint);
   void Branch(Condition cc,
               Result* arg0,
               Result* arg1,
               Result* arg2,
               Hint hint = no_hint);
   void Branch(Condition cc,
               Result* arg0,
               Result* arg1,
               Result* arg2,
               Result* arg3,
               Hint hint = no_hint);
 
   // Bind a jump target.  If there is no current frame at the binding
   // site, there must be at least one frame reaching via a forward
   // jump.
   //
   // The number of mergable elements is a number of frame elements
   // counting from the top down which must be "mergable" (not
   // constants or copies) in the entry frame at the jump target.
   // Backward jumps to the target must contain the same constants and
   // sharing as the entry frame, except for the mergable elements.
   //
   // A mergable elements argument of kAllElements indicates that all
   // frame elements must be mergable.  Mergable elements are ignored
   // completely for forward-only jump targets.
   virtual void Bind(int mergable_elements = kAllElements);
-  void Bind(Result* arg, int mergable_elements = kAllElements);
+  virtual void Bind(Result* arg, int mergable_elements = kAllElements);
   void Bind(Result* arg0, Result* arg1, int mergable_elements = kAllElements);
   void Bind(Result* arg0,
             Result* arg1,
             Result* arg2,
             int mergable_elements = kAllElements);
   void Bind(Result* arg0,
             Result* arg1,
             Result* arg2,
             Result* arg3,
             int mergable_elements = kAllElements);
@@ skipping 29 matching lines @@
 
   // 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:
   // Add a virtual frame reaching this labeled block via a forward
   // jump, and a fresh label for its merge code.
   void AddReachingFrame(VirtualFrame* frame);
 
   // Choose an element from a pair of frame elements to be in the
   // expected frame.  Return null if they are incompatible.
   FrameElement* Combine(FrameElement* left, FrameElement* right);
 
   // Compute a frame to use for entry to this block.  Mergable
@@ skipping 32 matching lines @@
   // 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.
   virtual void Jump();
+  virtual void Jump(Result* arg);
 
   // Emit a conditional branch to the target.  There must be a current
   // frame at the branch.  The current frame will fall through to the
   // code after the branch.
   virtual void Branch(Condition cc, Hint hint = no_hint);
+  virtual void Branch(Condition cc, Result* arg, Hint hint = no_hint);
 
   // Bind a break target.  If there is no current frame at the binding
   // site, there must be at least one frame reaching via a forward
   // jump.
   virtual void Bind(int mergable_elements = kAllElements);
+  virtual void Bind(Result* arg, int mergable_elements = kAllElements);
 
   // Setter for expected height.
   void set_expected_height(int expected) { expected_height_ = expected; }
 
  private:
   // The expected height of the expression stack where the target will
   // be bound, statically known at initialization time.
   int expected_height_;
 
   DISALLOW_COPY_AND_ASSIGN(BreakTarget);
@@ skipping 41 matching lines @@
   bool is_shadowing_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(ShadowTarget);
 };
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_JUMP_TARGET_H_