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_X87 | 7 #if V8_TARGET_ARCH_X87 |
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 2591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2602 HConstant* undefined = graph()->GetConstantUndefined(); | 2602 HConstant* undefined = graph()->GetConstantUndefined(); |
2603 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2603 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2604 instr->arguments_count(), | 2604 instr->arguments_count(), |
2605 instr->function(), | 2605 instr->function(), |
2606 undefined, | 2606 undefined, |
2607 instr->inlining_kind()); | 2607 instr->inlining_kind()); |
2608 // Only replay binding of arguments object if it wasn't removed from graph. | 2608 // Only replay binding of arguments object if it wasn't removed from graph. |
2609 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2609 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2610 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2610 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2611 } | 2611 } |
| 2612 inner->BindContext(instr->closure_context()); |
2612 inner->set_entry(instr); | 2613 inner->set_entry(instr); |
2613 current_block_->UpdateEnvironment(inner); | 2614 current_block_->UpdateEnvironment(inner); |
2614 chunk_->AddInlinedClosure(instr->closure()); | 2615 chunk_->AddInlinedClosure(instr->closure()); |
2615 return NULL; | 2616 return NULL; |
2616 } | 2617 } |
2617 | 2618 |
2618 | 2619 |
2619 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2620 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2620 LInstruction* pop = NULL; | 2621 LInstruction* pop = NULL; |
2621 | 2622 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2677 LOperand* function = UseRegisterAtStart(instr->function()); | 2678 LOperand* function = UseRegisterAtStart(instr->function()); |
2678 LAllocateBlockContext* result = | 2679 LAllocateBlockContext* result = |
2679 new(zone()) LAllocateBlockContext(context, function); | 2680 new(zone()) LAllocateBlockContext(context, function); |
2680 return MarkAsCall(DefineFixed(result, esi), instr); | 2681 return MarkAsCall(DefineFixed(result, esi), instr); |
2681 } | 2682 } |
2682 | 2683 |
2683 | 2684 |
2684 } } // namespace v8::internal | 2685 } } // namespace v8::internal |
2685 | 2686 |
2686 #endif // V8_TARGET_ARCH_X87 | 2687 #endif // V8_TARGET_ARCH_X87 |
OLD | NEW |