Reapply r1434 and port to ARM.
Review URL: http://codereview.chromium.org/40220 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1441 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
parent
cd71a2792c
commit
182c3ebb2d
@ -2214,28 +2214,34 @@ void CodeGenerator::VisitTryFinally(TryFinally* node) {
|
||||
}
|
||||
|
||||
// Unlink from try chain;
|
||||
if (unlink.is_linked()) {
|
||||
unlink.Bind();
|
||||
}
|
||||
|
||||
// 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()) {
|
||||
// Preserve TOS result in r0 across stack manipulation.
|
||||
frame_->EmitPop(r0);
|
||||
// Reload sp from the top handler, because some statements that we
|
||||
// break from (eg, for...in) may have left stuff on the stack.
|
||||
__ mov(r3, Operand(ExternalReference(Top::k_handler_address)));
|
||||
__ ldr(sp, MemOperand(r3));
|
||||
// The stack pointer was restored to just below the code slot
|
||||
// (the topmost slot) in the handler.
|
||||
// The stack pointer was restored to just below the code slot (the
|
||||
// topmost slot) in the handler.
|
||||
frame_->Forget(frame_->height() - handler_height + 1);
|
||||
const int kNextIndex = (StackHandlerConstants::kNextOffset
|
||||
+ StackHandlerConstants::kAddressDisplacement)
|
||||
/ kPointerSize;
|
||||
__ ldr(r1, frame_->ElementAt(kNextIndex));
|
||||
__ str(r1, MemOperand(r3));
|
||||
ASSERT(StackHandlerConstants::kCodeOffset == 0); // first field is code
|
||||
ASSERT(StackHandlerConstants::kCodeOffset == 0);
|
||||
// Drop the rest of the handler (not including the already dropped
|
||||
// code slot).
|
||||
frame_->Drop(StackHandlerConstants::kSize / kPointerSize - 1);
|
||||
// Restore the result to TOS.
|
||||
frame_->EmitPush(r0);
|
||||
}
|
||||
|
||||
// --- Finally block ---
|
||||
finally_block.Bind();
|
||||
|
@ -2830,7 +2830,13 @@ void CodeGenerator::VisitTryFinally(TryFinally* node) {
|
||||
}
|
||||
|
||||
// Unlink from try chain; be careful not to destroy the TOS.
|
||||
if (unlink.is_linked()) {
|
||||
unlink.Bind();
|
||||
}
|
||||
|
||||
// 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.
|
||||
@ -2846,6 +2852,7 @@ void CodeGenerator::VisitTryFinally(TryFinally* node) {
|
||||
frame_->Drop(StackHandlerConstants::kSize / kPointerSize - 1);
|
||||
// Next_sp popped.
|
||||
frame_->EmitPush(eax);
|
||||
}
|
||||
|
||||
// --- Finally block ---
|
||||
finally_block.Bind();
|
||||
|
33
test/mjsunit/regress/regress-259.js
Normal file
33
test/mjsunit/regress/regress-259.js
Normal file
@ -0,0 +1,33 @@
|
||||
// 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
|
||||
// with the distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived
|
||||
// from this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Test that we do not crash when compiling a try/finally with an
|
||||
// infinite loop (with no normal exits) in the try block.
|
||||
|
||||
// See http://code.google.com/p/v8/issues/detail?id=259
|
||||
|
||||
assertThrows("try { while (true) { throw 0; }} finally {}");
|
Loading…
Reference in New Issue
Block a user