Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: src/ia32/full-codegen-ia32.cc

Issue 10787017: Fix missing tagging of stack value in finally block. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « src/arm/full-codegen-arm.cc ('k') | src/mips/full-codegen-mips.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 4467 matching lines...) Expand 10 before | Expand all | Expand 10 after
4478 4478
4479 // Store pending message while executing finally block. 4479 // Store pending message while executing finally block.
4480 ExternalReference pending_message_obj = 4480 ExternalReference pending_message_obj =
4481 ExternalReference::address_of_pending_message_obj(isolate()); 4481 ExternalReference::address_of_pending_message_obj(isolate());
4482 __ mov(edx, Operand::StaticVariable(pending_message_obj)); 4482 __ mov(edx, Operand::StaticVariable(pending_message_obj));
4483 __ push(edx); 4483 __ push(edx);
4484 4484
4485 ExternalReference has_pending_message = 4485 ExternalReference has_pending_message =
4486 ExternalReference::address_of_has_pending_message(isolate()); 4486 ExternalReference::address_of_has_pending_message(isolate());
4487 __ mov(edx, Operand::StaticVariable(has_pending_message)); 4487 __ mov(edx, Operand::StaticVariable(has_pending_message));
4488 __ SmiTag(edx);
4488 __ push(edx); 4489 __ push(edx);
4489 4490
4490 ExternalReference pending_message_script = 4491 ExternalReference pending_message_script =
4491 ExternalReference::address_of_pending_message_script(isolate()); 4492 ExternalReference::address_of_pending_message_script(isolate());
4492 __ mov(edx, Operand::StaticVariable(pending_message_script)); 4493 __ mov(edx, Operand::StaticVariable(pending_message_script));
4493 __ push(edx); 4494 __ push(edx);
4494 } 4495 }
4495 4496
4496 4497
4497 void FullCodeGenerator::ExitFinallyBlock() { 4498 void FullCodeGenerator::ExitFinallyBlock() {
4498 ASSERT(!result_register().is(edx)); 4499 ASSERT(!result_register().is(edx));
4499 // Restore pending message from stack. 4500 // Restore pending message from stack.
4500 __ pop(edx); 4501 __ pop(edx);
4501 ExternalReference pending_message_script = 4502 ExternalReference pending_message_script =
4502 ExternalReference::address_of_pending_message_script(isolate()); 4503 ExternalReference::address_of_pending_message_script(isolate());
4503 __ mov(Operand::StaticVariable(pending_message_script), edx); 4504 __ mov(Operand::StaticVariable(pending_message_script), edx);
4504 4505
4505 __ pop(edx); 4506 __ pop(edx);
4507 __ SmiUntag(edx);
4506 ExternalReference has_pending_message = 4508 ExternalReference has_pending_message =
4507 ExternalReference::address_of_has_pending_message(isolate()); 4509 ExternalReference::address_of_has_pending_message(isolate());
4508 __ mov(Operand::StaticVariable(has_pending_message), edx); 4510 __ mov(Operand::StaticVariable(has_pending_message), edx);
4509 4511
4510 __ pop(edx); 4512 __ pop(edx);
4511 ExternalReference pending_message_obj = 4513 ExternalReference pending_message_obj =
4512 ExternalReference::address_of_pending_message_obj(isolate()); 4514 ExternalReference::address_of_pending_message_obj(isolate());
4513 __ mov(Operand::StaticVariable(pending_message_obj), edx); 4515 __ mov(Operand::StaticVariable(pending_message_obj), edx);
4514 4516
4515 // Restore result register from stack. 4517 // Restore result register from stack.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
4549 *context_length = 0; 4551 *context_length = 0;
4550 return previous_; 4552 return previous_;
4551 } 4553 }
4552 4554
4553 4555
4554 #undef __ 4556 #undef __
4555 4557
4556 } } // namespace v8::internal 4558 } } // namespace v8::internal
4557 4559
4558 #endif // V8_TARGET_ARCH_IA32 4560 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/arm/full-codegen-arm.cc ('k') | src/mips/full-codegen-mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698