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

Side by Side Diff: src/arm/lithium-arm.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 | « no previous file | src/ia32/lithium-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 2574 matching lines...) Expand 10 before | Expand all | Expand 10 after
2585 2585
2586 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { 2586 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) {
2587 HEnvironment* outer = current_block_->last_environment(); 2587 HEnvironment* outer = current_block_->last_environment();
2588 HConstant* undefined = graph()->GetConstantUndefined(); 2588 HConstant* undefined = graph()->GetConstantUndefined();
2589 HEnvironment* inner = outer->CopyForInlining(instr->closure(), 2589 HEnvironment* inner = outer->CopyForInlining(instr->closure(),
2590 instr->arguments_count(), 2590 instr->arguments_count(),
2591 instr->function(), 2591 instr->function(),
2592 undefined, 2592 undefined,
2593 instr->inlining_kind(), 2593 instr->inlining_kind(),
2594 instr->undefined_receiver()); 2594 instr->undefined_receiver());
2595 if (instr->arguments_var() != NULL) { 2595 // Only replay binding of arguments object if it wasn't removed from graph.
2596 inner->Bind(instr->arguments_var(), graph()->GetArgumentsObject()); 2596 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) {
2597 inner->Bind(instr->arguments_var(), instr->arguments_object());
2597 } 2598 }
2598 inner->set_entry(instr); 2599 inner->set_entry(instr);
2599 current_block_->UpdateEnvironment(inner); 2600 current_block_->UpdateEnvironment(inner);
2600 chunk_->AddInlinedClosure(instr->closure()); 2601 chunk_->AddInlinedClosure(instr->closure());
2601 return NULL; 2602 return NULL;
2602 } 2603 }
2603 2604
2604 2605
2605 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { 2606 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) {
2606 LInstruction* pop = NULL; 2607 LInstruction* pop = NULL;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
2650 2651
2651 2652
2652 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { 2653 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) {
2653 LOperand* object = UseRegister(instr->object()); 2654 LOperand* object = UseRegister(instr->object());
2654 LOperand* index = UseRegister(instr->index()); 2655 LOperand* index = UseRegister(instr->index());
2655 return DefineAsRegister(new(zone()) LLoadFieldByIndex(object, index)); 2656 return DefineAsRegister(new(zone()) LLoadFieldByIndex(object, index));
2656 } 2657 }
2657 2658
2658 2659
2659 } } // namespace v8::internal 2660 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/ia32/lithium-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698