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_MIPS | 7 #if V8_TARGET_ARCH_MIPS |
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 2490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2501 HConstant* undefined = graph()->GetConstantUndefined(); | 2501 HConstant* undefined = graph()->GetConstantUndefined(); |
2502 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2502 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2503 instr->arguments_count(), | 2503 instr->arguments_count(), |
2504 instr->function(), | 2504 instr->function(), |
2505 undefined, | 2505 undefined, |
2506 instr->inlining_kind()); | 2506 instr->inlining_kind()); |
2507 // Only replay binding of arguments object if it wasn't removed from graph. | 2507 // Only replay binding of arguments object if it wasn't removed from graph. |
2508 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2508 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2509 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2509 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2510 } | 2510 } |
| 2511 inner->BindContext(instr->closure_context()); |
2511 inner->set_entry(instr); | 2512 inner->set_entry(instr); |
2512 current_block_->UpdateEnvironment(inner); | 2513 current_block_->UpdateEnvironment(inner); |
2513 chunk_->AddInlinedClosure(instr->closure()); | 2514 chunk_->AddInlinedClosure(instr->closure()); |
2514 return NULL; | 2515 return NULL; |
2515 } | 2516 } |
2516 | 2517 |
2517 | 2518 |
2518 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2519 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2519 LInstruction* pop = NULL; | 2520 LInstruction* pop = NULL; |
2520 | 2521 |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2576 LOperand* context = UseFixed(instr->context(), cp); | 2577 LOperand* context = UseFixed(instr->context(), cp); |
2577 LOperand* function = UseRegisterAtStart(instr->function()); | 2578 LOperand* function = UseRegisterAtStart(instr->function()); |
2578 LAllocateBlockContext* result = | 2579 LAllocateBlockContext* result = |
2579 new(zone()) LAllocateBlockContext(context, function); | 2580 new(zone()) LAllocateBlockContext(context, function); |
2580 return MarkAsCall(DefineFixed(result, cp), instr); | 2581 return MarkAsCall(DefineFixed(result, cp), instr); |
2581 } | 2582 } |
2582 | 2583 |
2583 } } // namespace v8::internal | 2584 } } // namespace v8::internal |
2584 | 2585 |
2585 #endif // V8_TARGET_ARCH_MIPS | 2586 #endif // V8_TARGET_ARCH_MIPS |
OLD | NEW |