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 #include "src/arm/lithium-codegen-arm.h" | 7 #include "src/arm/lithium-codegen-arm.h" |
8 #include "src/hydrogen-osr.h" | 8 #include "src/hydrogen-osr.h" |
9 #include "src/lithium-inl.h" | 9 #include "src/lithium-inl.h" |
10 | 10 |
(...skipping 2541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2552 HConstant* undefined = graph()->GetConstantUndefined(); | 2552 HConstant* undefined = graph()->GetConstantUndefined(); |
2553 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2553 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2554 instr->arguments_count(), | 2554 instr->arguments_count(), |
2555 instr->function(), | 2555 instr->function(), |
2556 undefined, | 2556 undefined, |
2557 instr->inlining_kind()); | 2557 instr->inlining_kind()); |
2558 // Only replay binding of arguments object if it wasn't removed from graph. | 2558 // Only replay binding of arguments object if it wasn't removed from graph. |
2559 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2559 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2560 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2560 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2561 } | 2561 } |
| 2562 inner->BindContext(instr->closure_context()); |
2562 inner->set_entry(instr); | 2563 inner->set_entry(instr); |
2563 current_block_->UpdateEnvironment(inner); | 2564 current_block_->UpdateEnvironment(inner); |
2564 chunk_->AddInlinedClosure(instr->closure()); | 2565 chunk_->AddInlinedClosure(instr->closure()); |
2565 return NULL; | 2566 return NULL; |
2566 } | 2567 } |
2567 | 2568 |
2568 | 2569 |
2569 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2570 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2570 LInstruction* pop = NULL; | 2571 LInstruction* pop = NULL; |
2571 | 2572 |
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2624 LInstruction* LChunkBuilder::DoAllocateBlockContext( | 2625 LInstruction* LChunkBuilder::DoAllocateBlockContext( |
2625 HAllocateBlockContext* instr) { | 2626 HAllocateBlockContext* instr) { |
2626 LOperand* context = UseFixed(instr->context(), cp); | 2627 LOperand* context = UseFixed(instr->context(), cp); |
2627 LOperand* function = UseRegisterAtStart(instr->function()); | 2628 LOperand* function = UseRegisterAtStart(instr->function()); |
2628 LAllocateBlockContext* result = | 2629 LAllocateBlockContext* result = |
2629 new(zone()) LAllocateBlockContext(context, function); | 2630 new(zone()) LAllocateBlockContext(context, function); |
2630 return MarkAsCall(DefineFixed(result, cp), instr); | 2631 return MarkAsCall(DefineFixed(result, cp), instr); |
2631 } | 2632 } |
2632 | 2633 |
2633 } } // namespace v8::internal | 2634 } } // namespace v8::internal |
OLD | NEW |