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 2640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2651 ASSERT(instr->is_backwards_branch()); | 2651 ASSERT(instr->is_backwards_branch()); |
2652 LOperand* context = UseAny(instr->context()); | 2652 LOperand* context = UseAny(instr->context()); |
2653 return AssignEnvironment( | 2653 return AssignEnvironment( |
2654 AssignPointerMap(new(zone()) LStackCheck(context))); | 2654 AssignPointerMap(new(zone()) LStackCheck(context))); |
2655 } | 2655 } |
2656 } | 2656 } |
2657 | 2657 |
2658 | 2658 |
2659 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2659 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2660 HEnvironment* outer = current_block_->last_environment(); | 2660 HEnvironment* outer = current_block_->last_environment(); |
| 2661 outer->set_ast_id(instr->ReturnId()); |
2661 HConstant* undefined = graph()->GetConstantUndefined(); | 2662 HConstant* undefined = graph()->GetConstantUndefined(); |
2662 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2663 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2663 instr->arguments_count(), | 2664 instr->arguments_count(), |
2664 instr->function(), | 2665 instr->function(), |
2665 undefined, | 2666 undefined, |
2666 instr->inlining_kind()); | 2667 instr->inlining_kind()); |
2667 // Only replay binding of arguments object if it wasn't removed from graph. | 2668 // Only replay binding of arguments object if it wasn't removed from graph. |
2668 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2669 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2669 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2670 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2670 } | 2671 } |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2720 LOperand* index = UseTempRegister(instr->index()); | 2721 LOperand* index = UseTempRegister(instr->index()); |
2721 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); | 2722 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); |
2722 LInstruction* result = DefineSameAsFirst(load); | 2723 LInstruction* result = DefineSameAsFirst(load); |
2723 return AssignPointerMap(result); | 2724 return AssignPointerMap(result); |
2724 } | 2725 } |
2725 | 2726 |
2726 | 2727 |
2727 } } // namespace v8::internal | 2728 } } // namespace v8::internal |
2728 | 2729 |
2729 #endif // V8_TARGET_ARCH_IA32 | 2730 #endif // V8_TARGET_ARCH_IA32 |
OLD | NEW |