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 2503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2514 ASSERT(instr->is_backwards_branch()); | 2514 ASSERT(instr->is_backwards_branch()); |
2515 LOperand* context = UseAny(instr->context()); | 2515 LOperand* context = UseAny(instr->context()); |
2516 return AssignEnvironment( | 2516 return AssignEnvironment( |
2517 AssignPointerMap(new(zone()) LStackCheck(context))); | 2517 AssignPointerMap(new(zone()) LStackCheck(context))); |
2518 } | 2518 } |
2519 } | 2519 } |
2520 | 2520 |
2521 | 2521 |
2522 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2522 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2523 HEnvironment* outer = current_block_->last_environment(); | 2523 HEnvironment* outer = current_block_->last_environment(); |
| 2524 outer->set_ast_id(instr->ReturnId()); |
2524 HConstant* undefined = graph()->GetConstantUndefined(); | 2525 HConstant* undefined = graph()->GetConstantUndefined(); |
2525 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2526 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2526 instr->arguments_count(), | 2527 instr->arguments_count(), |
2527 instr->function(), | 2528 instr->function(), |
2528 undefined, | 2529 undefined, |
2529 instr->inlining_kind()); | 2530 instr->inlining_kind()); |
2530 // Only replay binding of arguments object if it wasn't removed from graph. | 2531 // Only replay binding of arguments object if it wasn't removed from graph. |
2531 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2532 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2532 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2533 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2533 } | 2534 } |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2580 | 2581 |
2581 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { | 2582 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { |
2582 LOperand* object = UseRegister(instr->object()); | 2583 LOperand* object = UseRegister(instr->object()); |
2583 LOperand* index = UseRegister(instr->index()); | 2584 LOperand* index = UseRegister(instr->index()); |
2584 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); | 2585 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); |
2585 LInstruction* result = DefineSameAsFirst(load); | 2586 LInstruction* result = DefineSameAsFirst(load); |
2586 return AssignPointerMap(result); | 2587 return AssignPointerMap(result); |
2587 } | 2588 } |
2588 | 2589 |
2589 } } // namespace v8::internal | 2590 } } // namespace v8::internal |
OLD | NEW |