| 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 2190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2201 return AssignEnvironment(AssignPointerMap(new LStackCheck)); | 2201 return AssignEnvironment(AssignPointerMap(new LStackCheck)); |
| 2202 } | 2202 } |
| 2203 } | 2203 } |
| 2204 | 2204 |
| 2205 | 2205 |
| 2206 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2206 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
| 2207 HEnvironment* outer = current_block_->last_environment(); | 2207 HEnvironment* outer = current_block_->last_environment(); |
| 2208 HConstant* undefined = graph()->GetConstantUndefined(); | 2208 HConstant* undefined = graph()->GetConstantUndefined(); |
| 2209 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2209 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
| 2210 instr->function(), | 2210 instr->function(), |
| 2211 HEnvironment::LITHIUM, | |
| 2212 undefined, | 2211 undefined, |
| 2213 instr->call_kind()); | 2212 instr->call_kind()); |
| 2214 current_block_->UpdateEnvironment(inner); | 2213 current_block_->UpdateEnvironment(inner); |
| 2215 chunk_->AddInlinedClosure(instr->closure()); | 2214 chunk_->AddInlinedClosure(instr->closure()); |
| 2216 return NULL; | 2215 return NULL; |
| 2217 } | 2216 } |
| 2218 | 2217 |
| 2219 | 2218 |
| 2220 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2219 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2221 HEnvironment* outer = current_block_->last_environment()->outer(); | 2220 HEnvironment* outer = current_block_->last_environment()->outer(); |
| 2222 current_block_->UpdateEnvironment(outer); | 2221 current_block_->UpdateEnvironment(outer); |
| 2223 return NULL; | 2222 return NULL; |
| 2224 } | 2223 } |
| 2225 | 2224 |
| 2226 | 2225 |
| 2227 LInstruction* LChunkBuilder::DoIn(HIn* instr) { | 2226 LInstruction* LChunkBuilder::DoIn(HIn* instr) { |
| 2228 LOperand* key = UseOrConstantAtStart(instr->key()); | 2227 LOperand* key = UseOrConstantAtStart(instr->key()); |
| 2229 LOperand* object = UseOrConstantAtStart(instr->object()); | 2228 LOperand* object = UseOrConstantAtStart(instr->object()); |
| 2230 LIn* result = new LIn(key, object); | 2229 LIn* result = new LIn(key, object); |
| 2231 return MarkAsCall(DefineFixed(result, rax), instr); | 2230 return MarkAsCall(DefineFixed(result, rax), instr); |
| 2232 } | 2231 } |
| 2233 | 2232 |
| 2234 | 2233 |
| 2235 } } // namespace v8::internal | 2234 } } // namespace v8::internal |
| 2236 | 2235 |
| 2237 #endif // V8_TARGET_ARCH_X64 | 2236 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |