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

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

Issue 16801006: Allocate generator result objects before unwinding try handlers (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Switch fallthrough for yield boxing Created 7 years, 6 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/full-codegen.h ('k') | src/ia32/full-codegen-ia32.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 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after
1223 --context_length; 1223 --context_length;
1224 } 1224 }
1225 StoreToFrameField(StandardFrameConstants::kContextOffset, 1225 StoreToFrameField(StandardFrameConstants::kContextOffset,
1226 context_register()); 1226 context_register());
1227 } 1227 }
1228 1228
1229 __ jmp(current->AsBreakable()->break_label()); 1229 __ jmp(current->AsBreakable()->break_label());
1230 } 1230 }
1231 1231
1232 1232
1233 void FullCodeGenerator::VisitReturnStatement(ReturnStatement* stmt) { 1233 void FullCodeGenerator::EmitUnwindBeforeReturn() {
1234 Comment cmnt(masm_, "[ ReturnStatement");
1235 SetStatementPosition(stmt);
1236 Expression* expr = stmt->expression();
1237 VisitForAccumulatorValue(expr);
1238
1239 // Exit all nested statements.
1240 NestedStatement* current = nesting_stack_; 1234 NestedStatement* current = nesting_stack_;
1241 int stack_depth = 0; 1235 int stack_depth = 0;
1242 int context_length = 0; 1236 int context_length = 0;
1243 while (current != NULL) { 1237 while (current != NULL) {
1244 current = current->Exit(&stack_depth, &context_length); 1238 current = current->Exit(&stack_depth, &context_length);
1245 } 1239 }
1246 __ Drop(stack_depth); 1240 __ Drop(stack_depth);
1241 }
1247 1242
1243
1244 void FullCodeGenerator::VisitReturnStatement(ReturnStatement* stmt) {
1245 Comment cmnt(masm_, "[ ReturnStatement");
1246 SetStatementPosition(stmt);
1247 Expression* expr = stmt->expression();
1248 VisitForAccumulatorValue(expr);
1249 EmitUnwindBeforeReturn();
1248 EmitReturnSequence(); 1250 EmitReturnSequence();
1249 } 1251 }
1250 1252
1251 1253
1252 void FullCodeGenerator::VisitWithStatement(WithStatement* stmt) { 1254 void FullCodeGenerator::VisitWithStatement(WithStatement* stmt) {
1253 Comment cmnt(masm_, "[ WithStatement"); 1255 Comment cmnt(masm_, "[ WithStatement");
1254 SetStatementPosition(stmt); 1256 SetStatementPosition(stmt);
1255 1257
1256 VisitForStackValue(stmt->expression()); 1258 VisitForStackValue(stmt->expression());
1257 PushFunctionArgumentForContextAllocation(); 1259 PushFunctionArgumentForContextAllocation();
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 } 1608 }
1607 1609
1608 return false; 1610 return false;
1609 } 1611 }
1610 1612
1611 1613
1612 #undef __ 1614 #undef __
1613 1615
1614 1616
1615 } } // namespace v8::internal 1617 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « src/full-codegen.h ('k') | src/ia32/full-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698