| OLD | NEW |
| 1 // Copyright 2012 the V8 project authors. All rights reserved. | 1 // Copyright 2012 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 2450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2461 } | 2461 } |
| 2462 | 2462 |
| 2463 | 2463 |
| 2464 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2464 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
| 2465 HEnvironment* outer = current_block_->last_environment(); | 2465 HEnvironment* outer = current_block_->last_environment(); |
| 2466 HConstant* undefined = graph()->GetConstantUndefined(); | 2466 HConstant* undefined = graph()->GetConstantUndefined(); |
| 2467 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2467 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
| 2468 instr->arguments_count(), | 2468 instr->arguments_count(), |
| 2469 instr->function(), | 2469 instr->function(), |
| 2470 undefined, | 2470 undefined, |
| 2471 instr->inlining_kind(), | 2471 instr->inlining_kind()); |
| 2472 instr->undefined_receiver()); | |
| 2473 // Only replay binding of arguments object if it wasn't removed from graph. | 2472 // Only replay binding of arguments object if it wasn't removed from graph. |
| 2474 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2473 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
| 2475 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2474 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
| 2476 } | 2475 } |
| 2477 inner->set_entry(instr); | 2476 inner->set_entry(instr); |
| 2478 current_block_->UpdateEnvironment(inner); | 2477 current_block_->UpdateEnvironment(inner); |
| 2479 chunk_->AddInlinedClosure(instr->closure()); | 2478 chunk_->AddInlinedClosure(instr->closure()); |
| 2480 return NULL; | 2479 return NULL; |
| 2481 } | 2480 } |
| 2482 | 2481 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2525 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { | 2524 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { |
| 2526 LOperand* object = UseRegister(instr->object()); | 2525 LOperand* object = UseRegister(instr->object()); |
| 2527 LOperand* index = UseTempRegister(instr->index()); | 2526 LOperand* index = UseTempRegister(instr->index()); |
| 2528 return DefineSameAsFirst(new(zone()) LLoadFieldByIndex(object, index)); | 2527 return DefineSameAsFirst(new(zone()) LLoadFieldByIndex(object, index)); |
| 2529 } | 2528 } |
| 2530 | 2529 |
| 2531 | 2530 |
| 2532 } } // namespace v8::internal | 2531 } } // namespace v8::internal |
| 2533 | 2532 |
| 2534 #endif // V8_TARGET_ARCH_X64 | 2533 #endif // V8_TARGET_ARCH_X64 |
| OLD | NEW |