Experimental: begin using the register allocator for do and while...

src/jump-target-ia32.cc

 // 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 119 matching lines @@
       __ jmp(&label_);
       __ bind(&original_fall_through);
     } else {
       expected_frame_->MakeMergable();
       ASSERT(cgen_->HasValidEntryRegisters());
       __ j(cc, &label_, hint);
     }
   } else {
     // No code needs to be emitted to merge to the expected frame at the
     // actual function return.
-    if (!cgen_->IsActualFunctionReturn(this)) {
-      current_frame->MergeTo(expected_frame_);
+    if (cgen_->IsActualFunctionReturn(this)) {
+      ASSERT(cgen_->HasValidEntryRegisters());
+      __ j(cc, &label_, hint);
+    } else {
+      // We negate the condition and emit the code to merge to the expected
+      // frame immediately.
+      //
+      // TODO(): This should be replaced with a solution that emits the
+      // merge code for forward CFG edges at the appropriate entry to the
+      // target block.
+      Label original_fall_through;
+      __ j(NegateCondition(cc), &original_fall_through, NegateHint(hint));
+      VirtualFrame* working_frame = new VirtualFrame(current_frame);
+      cgen_->SetFrame(working_frame);
+      working_frame->MergeTo(expected_frame_);
+      ASSERT(cgen_->HasValidEntryRegisters());
+      __ jmp(&label_);
+      cgen_->SetFrame(current_frame);
+      delete working_frame;
+      __ bind(&original_fall_through);
     }
-    ASSERT(cgen_->HasValidEntryRegisters());
-      __ j(cc, &label_, hint);
   }
   // Postcondition: there is both a current frame and an expected frame at
   // the label and they match.
 }
 
 
 void JumpTarget::Branch(Condition cc, Result* arg, Hint hint) {
   ASSERT(cgen_ != NULL);
   ASSERT(cgen_->has_valid_frame());
 
@@ skipping 203 matching lines @@
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 #undef __
 
 
 } }  // namespace v8::internal