| OLD | NEW |
| 1 // Copyright 2014 the V8 project authors. All rights reserved. | 1 // Copyright 2014 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 <sstream> | 5 #include <sstream> |
| 6 | 6 |
| 7 #include "src/v8.h" | 7 #include "src/v8.h" |
| 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 2533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2544 HEnvironment* inner = outer->CopyForInlining( | 2544 HEnvironment* inner = outer->CopyForInlining( |
| 2545 instr->closure(), instr->arguments_count(), instr->function(), undefined, | 2545 instr->closure(), instr->arguments_count(), instr->function(), undefined, |
| 2546 instr->inlining_kind()); | 2546 instr->inlining_kind()); |
| 2547 // Only replay binding of arguments object if it wasn't removed from graph. | 2547 // Only replay binding of arguments object if it wasn't removed from graph. |
| 2548 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2548 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
| 2549 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2549 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
| 2550 } | 2550 } |
| 2551 inner->BindContext(instr->closure_context()); | 2551 inner->BindContext(instr->closure_context()); |
| 2552 inner->set_entry(instr); | 2552 inner->set_entry(instr); |
| 2553 current_block_->UpdateEnvironment(inner); | 2553 current_block_->UpdateEnvironment(inner); |
| 2554 chunk_->AddInlinedClosure(instr->closure()); | 2554 chunk_->AddInlinedFunction(instr->shared()); |
| 2555 return NULL; | 2555 return NULL; |
| 2556 } | 2556 } |
| 2557 | 2557 |
| 2558 | 2558 |
| 2559 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2559 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2560 LInstruction* pop = NULL; | 2560 LInstruction* pop = NULL; |
| 2561 | 2561 |
| 2562 HEnvironment* env = current_block_->last_environment(); | 2562 HEnvironment* env = current_block_->last_environment(); |
| 2563 | 2563 |
| 2564 if (env->entry()->arguments_pushed()) { | 2564 if (env->entry()->arguments_pushed()) { |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2615 LInstruction* LChunkBuilder::DoAllocateBlockContext( | 2615 LInstruction* LChunkBuilder::DoAllocateBlockContext( |
| 2616 HAllocateBlockContext* instr) { | 2616 HAllocateBlockContext* instr) { |
| 2617 LOperand* context = UseFixed(instr->context(), cp); | 2617 LOperand* context = UseFixed(instr->context(), cp); |
| 2618 LOperand* function = UseRegisterAtStart(instr->function()); | 2618 LOperand* function = UseRegisterAtStart(instr->function()); |
| 2619 LAllocateBlockContext* result = | 2619 LAllocateBlockContext* result = |
| 2620 new (zone()) LAllocateBlockContext(context, function); | 2620 new (zone()) LAllocateBlockContext(context, function); |
| 2621 return MarkAsCall(DefineFixed(result, cp), instr); | 2621 return MarkAsCall(DefineFixed(result, cp), instr); |
| 2622 } | 2622 } |
| 2623 } | 2623 } |
| 2624 } // namespace v8::internal | 2624 } // namespace v8::internal |
| OLD | NEW |