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 2528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2539 ASSERT(instr->is_backwards_branch()); | 2539 ASSERT(instr->is_backwards_branch()); |
2540 LOperand* context = UseAny(instr->context()); | 2540 LOperand* context = UseAny(instr->context()); |
2541 return AssignEnvironment( | 2541 return AssignEnvironment( |
2542 AssignPointerMap(new(zone()) LStackCheck(context))); | 2542 AssignPointerMap(new(zone()) LStackCheck(context))); |
2543 } | 2543 } |
2544 } | 2544 } |
2545 | 2545 |
2546 | 2546 |
2547 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2547 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2548 HEnvironment* outer = current_block_->last_environment(); | 2548 HEnvironment* outer = current_block_->last_environment(); |
| 2549 outer->set_ast_id(instr->ReturnId()); |
2549 HConstant* undefined = graph()->GetConstantUndefined(); | 2550 HConstant* undefined = graph()->GetConstantUndefined(); |
2550 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2551 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2551 instr->arguments_count(), | 2552 instr->arguments_count(), |
2552 instr->function(), | 2553 instr->function(), |
2553 undefined, | 2554 undefined, |
2554 instr->inlining_kind()); | 2555 instr->inlining_kind()); |
2555 // Only replay binding of arguments object if it wasn't removed from graph. | 2556 // Only replay binding of arguments object if it wasn't removed from graph. |
2556 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2557 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2557 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2558 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2558 } | 2559 } |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2609 LOperand* index = UseTempRegister(instr->index()); | 2610 LOperand* index = UseTempRegister(instr->index()); |
2610 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); | 2611 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); |
2611 LInstruction* result = DefineSameAsFirst(load); | 2612 LInstruction* result = DefineSameAsFirst(load); |
2612 return AssignPointerMap(result); | 2613 return AssignPointerMap(result); |
2613 } | 2614 } |
2614 | 2615 |
2615 | 2616 |
2616 } } // namespace v8::internal | 2617 } } // namespace v8::internal |
2617 | 2618 |
2618 #endif // V8_TARGET_ARCH_X64 | 2619 #endif // V8_TARGET_ARCH_X64 |
OLD | NEW |