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

Unified Diff: src/codegen-arm.cc

Issue 14892: Merge changes from bleeding_edge into experimental toiger branch.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/toiger/
Patch Set: Created 12 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/bytecodes-irregexp.h ('k') | src/codegen-ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/codegen-arm.cc
===================================================================
--- src/codegen-arm.cc (revision 1012)
+++ src/codegen-arm.cc (working copy)
@@ -1236,7 +1236,11 @@
Comment cmnt(masm_, "[ WithEnterStatement");
CodeForStatement(node);
Load(node->expression());
- frame_->CallRuntime(Runtime::kPushContext, 1);
+ if (node->is_catch_block()) {
+ frame_->CallRuntime(Runtime::kPushCatchContext, 1);
+ } else {
+ frame_->CallRuntime(Runtime::kPushContext, 1);
+ }
if (kDebug) {
JumpTarget verified_true(this);
__ cmp(r0, Operand(cp));
« no previous file with comments | « src/bytecodes-irregexp.h ('k') | src/codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698