| 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 2249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2260 return AssignEnvironment(AssignPointerMap(new LStackCheck)); | 2260 return AssignEnvironment(AssignPointerMap(new LStackCheck)); |
| 2261 } | 2261 } |
| 2262 } | 2262 } |
| 2263 | 2263 |
| 2264 | 2264 |
| 2265 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2265 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
| 2266 HEnvironment* outer = current_block_->last_environment(); | 2266 HEnvironment* outer = current_block_->last_environment(); |
| 2267 HConstant* undefined = graph()->GetConstantUndefined(); | 2267 HConstant* undefined = graph()->GetConstantUndefined(); |
| 2268 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2268 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
| 2269 instr->function(), | 2269 instr->function(), |
| 2270 HEnvironment::LITHIUM, | |
| 2271 undefined, | 2270 undefined, |
| 2272 instr->call_kind()); | 2271 instr->call_kind()); |
| 2273 current_block_->UpdateEnvironment(inner); | 2272 current_block_->UpdateEnvironment(inner); |
| 2274 chunk_->AddInlinedClosure(instr->closure()); | 2273 chunk_->AddInlinedClosure(instr->closure()); |
| 2275 return NULL; | 2274 return NULL; |
| 2276 } | 2275 } |
| 2277 | 2276 |
| 2278 | 2277 |
| 2279 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2278 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2280 HEnvironment* outer = current_block_->last_environment()->outer(); | 2279 HEnvironment* outer = current_block_->last_environment()->outer(); |
| 2281 current_block_->UpdateEnvironment(outer); | 2280 current_block_->UpdateEnvironment(outer); |
| 2282 return NULL; | 2281 return NULL; |
| 2283 } | 2282 } |
| 2284 | 2283 |
| 2285 | 2284 |
| 2286 LInstruction* LChunkBuilder::DoIn(HIn* instr) { | 2285 LInstruction* LChunkBuilder::DoIn(HIn* instr) { |
| 2287 LOperand* key = UseOrConstantAtStart(instr->key()); | 2286 LOperand* key = UseOrConstantAtStart(instr->key()); |
| 2288 LOperand* object = UseOrConstantAtStart(instr->object()); | 2287 LOperand* object = UseOrConstantAtStart(instr->object()); |
| 2289 LIn* result = new LIn(key, object); | 2288 LIn* result = new LIn(key, object); |
| 2290 return MarkAsCall(DefineFixed(result, eax), instr); | 2289 return MarkAsCall(DefineFixed(result, eax), instr); |
| 2291 } | 2290 } |
| 2292 | 2291 |
| 2293 | 2292 |
| 2294 } } // namespace v8::internal | 2293 } } // namespace v8::internal |
| 2295 | 2294 |
| 2296 #endif // V8_TARGET_ARCH_IA32 | 2295 #endif // V8_TARGET_ARCH_IA32 |
| OLD | NEW |