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

Side by Side Diff: src/x64/lithium-x64.cc

Issue 16938009: Fix bogus replay of arguments object binding in LChunkBuilder. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: 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/mips/lithium-mips.cc ('k') | no next file » | 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 2511 matching lines...) Expand 10 before | Expand all | Expand 10 after
2522 2522
2523 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { 2523 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
2524 HEnvironment* outer = current_block_->last_environment(); 2524 HEnvironment* outer = current_block_->last_environment();
2525 HConstant* undefined = graph()->GetConstantUndefined(); 2525 HConstant* undefined = graph()->GetConstantUndefined();
2526 HEnvironment* inner = outer->CopyForInlining(instr->closure(), 2526 HEnvironment* inner = outer->CopyForInlining(instr->closure(),
2527 instr->arguments_count(), 2527 instr->arguments_count(),
2528 instr->function(), 2528 instr->function(),
2529 undefined, 2529 undefined,
2530 instr->inlining_kind(), 2530 instr->inlining_kind(),
2531 instr->undefined_receiver()); 2531 instr->undefined_receiver());
2532 if (instr->arguments_var() != NULL) { 2532 // Only replay binding of arguments object if it wasn't removed from graph.
2533 inner->Bind(instr->arguments_var(), graph()->GetArgumentsObject()); 2533 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) {
2534 inner->Bind(instr->arguments_var(), instr->arguments_object());
2534 } 2535 }
2535 inner->set_entry(instr); 2536 inner->set_entry(instr);
2536 current_block_->UpdateEnvironment(inner); 2537 current_block_->UpdateEnvironment(inner);
2537 chunk_->AddInlinedClosure(instr->closure()); 2538 chunk_->AddInlinedClosure(instr->closure());
2538 return NULL; 2539 return NULL;
2539 } 2540 }
2540 2541
2541 2542
2542 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { 2543 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) {
2543 LInstruction* pop = NULL; 2544 LInstruction* pop = NULL;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
2590 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { 2591 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) {
2591 LOperand* object = UseRegister(instr->object()); 2592 LOperand* object = UseRegister(instr->object());
2592 LOperand* index = UseTempRegister(instr->index()); 2593 LOperand* index = UseTempRegister(instr->index());
2593 return DefineSameAsFirst(new(zone()) LLoadFieldByIndex(object, index)); 2594 return DefineSameAsFirst(new(zone()) LLoadFieldByIndex(object, index));
2594 } 2595 }
2595 2596
2596 2597
2597 } } // namespace v8::internal 2598 } } // namespace v8::internal
2598 2599
2599 #endif // V8_TARGET_ARCH_X64 2600 #endif // V8_TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « src/mips/lithium-mips.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698