Reapply revision 1949. Stupid error....

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 17 matching lines @@
 #ifndef V8_JUMP_TARGET_H_
 #define V8_JUMP_TARGET_H_
 
 namespace v8 { namespace internal {
 
 // Forward declarations.
 class FrameElement;
 class Result;
 class VirtualFrame;
 
-
 // -------------------------------------------------------------------------
 // Jump targets
 //
 // A jump target is an abstraction of a basic-block entry in generated
 // code.  It collects all the virtual frames reaching the block by
 // forward jumps and pairs them with labels for the merge code along
 // 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.
@@ skipping 12 matching lines @@
   // 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();
 
+  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);
 
   // Treat the jump target as a fresh one.  The state is reset.
   void Unuse();
 
@@ skipping 111 matching lines @@
   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,
   // and a corresponding merge code label.
   void AddReachingFrame(VirtualFrame* frame);
 
-  // Compute a frame to use for entry to this block.  Mergable elements
-  // is as described for the Bind function.
+  // Perform initialization required during entry frame computation
+  // after setting the virtual frame element at index in frame to be
+  // target.
+  inline void InitializeEntryElement(int index, FrameElement* target);
+
+  // Compute a frame to use for entry to this block.  Mergable
+  // elements is as described for the Bind function.
   void ComputeEntryFrame(int mergable_elements);
 
   DISALLOW_COPY_AND_ASSIGN(JumpTarget);
 };
 
 
 // -------------------------------------------------------------------------
 // Break targets
 //
 // A break target is a jump target that can be used to break out of a
 // statement that keeps extra state on the stack (eg, for/in or
 // try/finally).  They know the expected stack height at the target
 // and will drop state from nested statements as part of merging.
 //
 // Break targets are used for return, break, and continue targets.
 
 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);
 
   // 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
@@ skipping 42 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() {}
+
   // 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_