Author: [email protected]
Date: Fri Mar 6 03:59:53 2009
New Revision: 1437
Removed:
branches/bleeding_edge/test/mjsunit/regress/regress-259.js
Modified:
branches/bleeding_edge/src/codegen-ia32.cc
Log:
Reverted r1434
Modified: branches/bleeding_edge/src/codegen-ia32.cc
==============================================================================
--- branches/bleeding_edge/src/codegen-ia32.cc (original)
+++ branches/bleeding_edge/src/codegen-ia32.cc Fri Mar 6 03:59:53 2009
@@ -2830,29 +2830,22 @@
}
// Unlink from try chain; be careful not to destroy the TOS.
- if (unlink.is_linked()) {
- unlink.Bind();
- }
+ unlink.Bind();
+ // Reload sp from the top handler, because some statements that we
+ // break from (eg, for...in) may have left stuff on the stack.
+ // Preserve the TOS in a register across stack manipulation.
+ frame_->EmitPop(eax);
+ ExternalReference handler_address(Top::k_handler_address);
+ __ mov(edx, Operand::StaticVariable(handler_address));
+ const int kNextOffset = StackHandlerConstants::kNextOffset +
+ StackHandlerConstants::kAddressDisplacement;
+ __ lea(esp, Operand(edx, kNextOffset));
+ frame_->Forget(frame_->height() - handler_height);
- // Control can reach here via a jump to unlink or by falling off the
- // end of the try block (with no unlinks).
- if (has_valid_frame()) {
- // Reload sp from the top handler, because some statements that we
- // break from (eg, for...in) may have left stuff on the stack.
- // Preserve the TOS in a register across stack manipulation.
- frame_->EmitPop(eax);
- ExternalReference handler_address(Top::k_handler_address);
- __ mov(edx, Operand::StaticVariable(handler_address));
- const int kNextOffset = StackHandlerConstants::kNextOffset +
- StackHandlerConstants::kAddressDisplacement;
- __ lea(esp, Operand(edx, kNextOffset));
- frame_->Forget(frame_->height() - handler_height);
-
- frame_->EmitPop(Operand::StaticVariable(handler_address));
- frame_->Drop(StackHandlerConstants::kSize / kPointerSize - 1);
- // Next_sp popped.
- frame_->EmitPush(eax);
- }
+ frame_->EmitPop(Operand::StaticVariable(handler_address));
+ frame_->Drop(StackHandlerConstants::kSize / kPointerSize - 1);
+ // Next_sp popped.
+ frame_->EmitPush(eax);
// --- Finally block ---
finally_block.Bind();
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
