- Make VirtualFrame and JumpTarget zone allocated....

src/jump-target.cc

 // Copyright 2009 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 23 matching lines @@
 
 // -------------------------------------------------------------------------
 // JumpTarget implementation.
 
 bool JumpTarget::compiling_deferred_code_ = false;
 
 
 JumpTarget::JumpTarget(CodeGenerator* cgen, Directionality direction)
     : cgen_(cgen),
       direction_(direction),
+      is_bound_(false),
+      is_linked_(false),
       reaching_frames_(0),
       merge_labels_(0),
-      entry_frame_(NULL),
-      is_bound_(false),
-      is_linked_(false) {
+      entry_frame_(NULL) {
   ASSERT(cgen != NULL);
   masm_ = cgen->masm();
 }
 
 
 JumpTarget::JumpTarget()
     : cgen_(NULL),
       masm_(NULL),
       direction_(FORWARD_ONLY),
+      is_bound_(false),
+      is_linked_(false),
       reaching_frames_(0),
       merge_labels_(0),
-      entry_frame_(NULL),
-      is_bound_(false),
-      is_linked_(false) {
+      entry_frame_(NULL) {
 }
 
 
 void JumpTarget::Initialize(CodeGenerator* cgen, Directionality direction) {
   ASSERT(cgen != NULL);
   ASSERT(cgen_ == NULL);
   cgen_ = cgen;
   masm_ = cgen->masm();
   direction_ = direction;
 }
 
 
 void JumpTarget::Unuse() {
-  // We should not deallocate jump targets that have unresolved jumps
-  // to them.  In the event of a compile-time stack overflow or an
-  // uninitialized jump target, we don't care.
-  ASSERT(!is_linked() || cgen_ == NULL || cgen_->HasStackOverflow());
-  for (int i = 0; i < reaching_frames_.length(); i++) {
-    delete reaching_frames_[i];
-  }
-  delete entry_frame_;
-  Reset();
-}
-
-
-void JumpTarget::Reset() {
   reaching_frames_.Clear();
   merge_labels_.Clear();
   entry_frame_ = NULL;
   entry_label_.Unuse();
   is_bound_ = false;
   is_linked_ = false;
 }
 
 
 void JumpTarget::ComputeEntryFrame(int mergable_elements) {
@@ skipping 556 matching lines @@
 ShadowTarget::ShadowTarget(BreakTarget* shadowed) {
   ASSERT(shadowed != NULL);
   other_target_ = shadowed;
 
 #ifdef DEBUG
   is_shadowing_ = true;
 #endif
   // While shadowing this shadow target saves the state of the original.
   shadowed->CopyTo(this);
 
-  // The original's state is reset.  We do not Unuse it because that
-  // would delete the expected frame and assert that the target is not
-  // linked.
-  shadowed->Reset();
+  // The original's state is reset.
+  shadowed->Unuse();
   ASSERT(cgen_ != NULL);
   ASSERT(cgen_->has_valid_frame());
   shadowed->set_expected_height(cgen_->frame()->height());
 
   // Setting the code generator to null prevents the shadow target from
   // being used until shadowing stops.
   cgen_ = NULL;
   masm_ = NULL;
 }
 
 
 void ShadowTarget::StopShadowing() {
   ASSERT(is_shadowing_);
 
   // This target does not have a valid code generator yet.
   cgen_ = other_target_->code_generator();
   ASSERT(cgen_ != NULL);
   masm_ = cgen_->masm();
 
   // The states of this target, which was shadowed, and the original
   // target, which was shadowing, are swapped.
   BreakTarget temp;
   other_target_->CopyTo(&temp);
   CopyTo(other_target_);
   temp.CopyTo(this);
-  temp.Reset();  // So the destructor does not deallocate virtual frames.
+  temp.Unuse();
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 
 } }  // namespace v8::internal