| 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 "src/crankshaft/s390/lithium-s390.h" | 5 #include "src/crankshaft/s390/lithium-s390.h" |
| 6 | 6 |
| 7 #include <sstream> | 7 #include <sstream> |
| 8 | 8 |
| 9 #include "src/crankshaft/hydrogen-osr.h" | 9 #include "src/crankshaft/hydrogen-osr.h" |
| 10 #include "src/crankshaft/lithium-inl.h" | 10 #include "src/crankshaft/lithium-inl.h" |
| (...skipping 2105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2116 HEnvironment* inner = outer->CopyForInlining( | 2116 HEnvironment* inner = outer->CopyForInlining( |
| 2117 instr->closure(), instr->arguments_count(), instr->function(), undefined, | 2117 instr->closure(), instr->arguments_count(), instr->function(), undefined, |
| 2118 instr->inlining_kind(), instr->syntactic_tail_call_mode()); | 2118 instr->inlining_kind(), instr->syntactic_tail_call_mode()); |
| 2119 // Only replay binding of arguments object if it wasn't removed from graph. | 2119 // Only replay binding of arguments object if it wasn't removed from graph. |
| 2120 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2120 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
| 2121 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2121 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
| 2122 } | 2122 } |
| 2123 inner->BindContext(instr->closure_context()); | 2123 inner->BindContext(instr->closure_context()); |
| 2124 inner->set_entry(instr); | 2124 inner->set_entry(instr); |
| 2125 current_block_->UpdateEnvironment(inner); | 2125 current_block_->UpdateEnvironment(inner); |
| 2126 chunk_->AddInlinedFunction(instr->shared()); | |
| 2127 return NULL; | 2126 return NULL; |
| 2128 } | 2127 } |
| 2129 | 2128 |
| 2130 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2129 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2131 LInstruction* pop = NULL; | 2130 LInstruction* pop = NULL; |
| 2132 | 2131 |
| 2133 HEnvironment* env = current_block_->last_environment(); | 2132 HEnvironment* env = current_block_->last_environment(); |
| 2134 | 2133 |
| 2135 if (env->entry()->arguments_pushed()) { | 2134 if (env->entry()->arguments_pushed()) { |
| 2136 int argument_count = env->arguments_environment()->parameter_count(); | 2135 int argument_count = env->arguments_environment()->parameter_count(); |
| (...skipping 30 matching lines...) Expand all Loading... |
| 2167 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { | 2166 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { |
| 2168 LOperand* object = UseRegister(instr->object()); | 2167 LOperand* object = UseRegister(instr->object()); |
| 2169 LOperand* index = UseTempRegister(instr->index()); | 2168 LOperand* index = UseTempRegister(instr->index()); |
| 2170 LLoadFieldByIndex* load = new (zone()) LLoadFieldByIndex(object, index); | 2169 LLoadFieldByIndex* load = new (zone()) LLoadFieldByIndex(object, index); |
| 2171 LInstruction* result = DefineSameAsFirst(load); | 2170 LInstruction* result = DefineSameAsFirst(load); |
| 2172 return AssignPointerMap(result); | 2171 return AssignPointerMap(result); |
| 2173 } | 2172 } |
| 2174 | 2173 |
| 2175 } // namespace internal | 2174 } // namespace internal |
| 2176 } // namespace v8 | 2175 } // namespace v8 |
| OLD | NEW |