OLD | NEW |
1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 2156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2167 return MarkAsCall(new LStackCheck, instr); | 2167 return MarkAsCall(new LStackCheck, instr); |
2168 } | 2168 } |
2169 | 2169 |
2170 | 2170 |
2171 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2171 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2172 HEnvironment* outer = current_block_->last_environment(); | 2172 HEnvironment* outer = current_block_->last_environment(); |
2173 HConstant* undefined = graph()->GetConstantUndefined(); | 2173 HConstant* undefined = graph()->GetConstantUndefined(); |
2174 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2174 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2175 instr->function(), | 2175 instr->function(), |
2176 HEnvironment::LITHIUM, | 2176 HEnvironment::LITHIUM, |
2177 undefined); | 2177 undefined, |
| 2178 instr->call_kind()); |
2178 current_block_->UpdateEnvironment(inner); | 2179 current_block_->UpdateEnvironment(inner); |
2179 chunk_->AddInlinedClosure(instr->closure()); | 2180 chunk_->AddInlinedClosure(instr->closure()); |
2180 return NULL; | 2181 return NULL; |
2181 } | 2182 } |
2182 | 2183 |
2183 | 2184 |
2184 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2185 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2185 HEnvironment* outer = current_block_->last_environment()->outer(); | 2186 HEnvironment* outer = current_block_->last_environment()->outer(); |
2186 current_block_->UpdateEnvironment(outer); | 2187 current_block_->UpdateEnvironment(outer); |
2187 return NULL; | 2188 return NULL; |
2188 } | 2189 } |
2189 | 2190 |
2190 | 2191 |
2191 LInstruction* LChunkBuilder::DoIn(HIn* instr) { | 2192 LInstruction* LChunkBuilder::DoIn(HIn* instr) { |
2192 LOperand* key = UseOrConstantAtStart(instr->key()); | 2193 LOperand* key = UseOrConstantAtStart(instr->key()); |
2193 LOperand* object = UseOrConstantAtStart(instr->object()); | 2194 LOperand* object = UseOrConstantAtStart(instr->object()); |
2194 LIn* result = new LIn(key, object); | 2195 LIn* result = new LIn(key, object); |
2195 return MarkAsCall(DefineFixed(result, rax), instr); | 2196 return MarkAsCall(DefineFixed(result, rax), instr); |
2196 } | 2197 } |
2197 | 2198 |
2198 | 2199 |
2199 } } // namespace v8::internal | 2200 } } // namespace v8::internal |
2200 | 2201 |
2201 #endif // V8_TARGET_ARCH_X64 | 2202 #endif // V8_TARGET_ARCH_X64 |
OLD | NEW |