Experimental: a temporary bugfix for an issue causing an incorrect...

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 91 matching lines @@
   ASSERT(masm_ != NULL);
 
   VirtualFrame* current_frame = cgen_->frame();
   ASSERT(current_frame != NULL);
 
   if (expected_frame_ == NULL) {
     expected_frame_ = new VirtualFrame(current_frame);
     // For a branch, the frame at the fall-through basic block (not labeled)
     // does not need to be mergable, but only the other (labeled) one.  That
     // is achieved by reversing the condition and emitting the make mergable
-    // code as the actual fall-through block.  This is necessary only when
-    // MakeMergable will generate code.
-    if (expected_frame_->RequiresMergeCode()) {
-      Label original_fall_through;
-      __ j(NegateCondition(cc), &original_fall_through, NegateHint(hint));
-      expected_frame_->MakeMergable();
-      __ jmp(&label_);
-      __ bind(&original_fall_through);
-    } else {
-      expected_frame_->MakeMergable();
-      ASSERT(cgen_->HasValidEntryRegisters());
-      __ j(cc, &label_, hint);
-    }
+    // code as the actual fall-through block.
+    //
+    // TODO(): This is necessary only when MakeMergable will generate code.
+    Label original_fall_through;
+    __ j(NegateCondition(cc), &original_fall_through, NegateHint(hint));
+    expected_frame_->MakeMergable();
+    __ jmp(&label_);
+    __ bind(&original_fall_through);
   } 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);
@@ skipping 229 matching lines @@
 
 #ifdef DEBUG
   is_shadowing_ = false;
 #endif
 }
 
 #undef __
 
 
 } }  // namespace v8::internal