OLD | NEW |
1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 the V8 project authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "src/v8.h" | 5 #include "src/v8.h" |
6 | 6 |
7 #if V8_TARGET_ARCH_X64 | 7 #if V8_TARGET_ARCH_X64 |
8 | 8 |
9 #include "src/hydrogen-osr.h" | 9 #include "src/hydrogen-osr.h" |
10 #include "src/lithium-inl.h" | 10 #include "src/lithium-inl.h" |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
602 LTemplateResultInstruction<1>* instr, | 602 LTemplateResultInstruction<1>* instr, |
603 XMMRegister reg) { | 603 XMMRegister reg) { |
604 return Define(instr, ToUnallocated(reg)); | 604 return Define(instr, ToUnallocated(reg)); |
605 } | 605 } |
606 | 606 |
607 | 607 |
608 LInstruction* LChunkBuilder::AssignEnvironment(LInstruction* instr) { | 608 LInstruction* LChunkBuilder::AssignEnvironment(LInstruction* instr) { |
609 HEnvironment* hydrogen_env = current_block_->last_environment(); | 609 HEnvironment* hydrogen_env = current_block_->last_environment(); |
610 int argument_index_accumulator = 0; | 610 int argument_index_accumulator = 0; |
611 ZoneList<HValue*> objects_to_materialize(0, zone()); | 611 ZoneList<HValue*> objects_to_materialize(0, zone()); |
612 instr->set_environment(CreateEnvironment(hydrogen_env, | 612 instr->set_environment(CreateEnvironment( |
613 &argument_index_accumulator, | 613 hydrogen_env, &argument_index_accumulator, &objects_to_materialize)); |
614 &objects_to_materialize)); | |
615 return instr; | 614 return instr; |
616 } | 615 } |
617 | 616 |
618 | 617 |
619 LInstruction* LChunkBuilder::MarkAsCall(LInstruction* instr, | 618 LInstruction* LChunkBuilder::MarkAsCall(LInstruction* instr, |
620 HInstruction* hinstr, | 619 HInstruction* hinstr, |
621 CanDeoptimize can_deoptimize) { | 620 CanDeoptimize can_deoptimize) { |
622 info()->MarkAsNonDeferredCalling(); | 621 info()->MarkAsNonDeferredCalling(); |
623 | 622 |
624 #ifdef DEBUG | 623 #ifdef DEBUG |
(...skipping 1976 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2601 HConstant* undefined = graph()->GetConstantUndefined(); | 2600 HConstant* undefined = graph()->GetConstantUndefined(); |
2602 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2601 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2603 instr->arguments_count(), | 2602 instr->arguments_count(), |
2604 instr->function(), | 2603 instr->function(), |
2605 undefined, | 2604 undefined, |
2606 instr->inlining_kind()); | 2605 instr->inlining_kind()); |
2607 // Only replay binding of arguments object if it wasn't removed from graph. | 2606 // Only replay binding of arguments object if it wasn't removed from graph. |
2608 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2607 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2609 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2608 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2610 } | 2609 } |
| 2610 inner->BindContext(instr->closure_context()); |
2611 inner->set_entry(instr); | 2611 inner->set_entry(instr); |
2612 current_block_->UpdateEnvironment(inner); | 2612 current_block_->UpdateEnvironment(inner); |
2613 chunk_->AddInlinedClosure(instr->closure()); | 2613 chunk_->AddInlinedClosure(instr->closure()); |
2614 return NULL; | 2614 return NULL; |
2615 } | 2615 } |
2616 | 2616 |
2617 | 2617 |
2618 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2618 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2619 LInstruction* pop = NULL; | 2619 LInstruction* pop = NULL; |
2620 | 2620 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2677 LOperand* function = UseRegisterAtStart(instr->function()); | 2677 LOperand* function = UseRegisterAtStart(instr->function()); |
2678 LAllocateBlockContext* result = | 2678 LAllocateBlockContext* result = |
2679 new(zone()) LAllocateBlockContext(context, function); | 2679 new(zone()) LAllocateBlockContext(context, function); |
2680 return MarkAsCall(DefineFixed(result, rsi), instr); | 2680 return MarkAsCall(DefineFixed(result, rsi), instr); |
2681 } | 2681 } |
2682 | 2682 |
2683 | 2683 |
2684 } } // namespace v8::internal | 2684 } } // namespace v8::internal |
2685 | 2685 |
2686 #endif // V8_TARGET_ARCH_X64 | 2686 #endif // V8_TARGET_ARCH_X64 |
OLD | NEW |