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 2454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2465 ASSERT(instr->is_backwards_branch()); | 2465 ASSERT(instr->is_backwards_branch()); |
2466 LOperand* context = UseAny(instr->context()); | 2466 LOperand* context = UseAny(instr->context()); |
2467 return AssignEnvironment( | 2467 return AssignEnvironment( |
2468 AssignPointerMap(new(zone()) LStackCheck(context))); | 2468 AssignPointerMap(new(zone()) LStackCheck(context))); |
2469 } | 2469 } |
2470 } | 2470 } |
2471 | 2471 |
2472 | 2472 |
2473 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2473 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2474 HEnvironment* outer = current_block_->last_environment(); | 2474 HEnvironment* outer = current_block_->last_environment(); |
| 2475 outer->set_ast_id(instr->ReturnId()); |
2475 HConstant* undefined = graph()->GetConstantUndefined(); | 2476 HConstant* undefined = graph()->GetConstantUndefined(); |
2476 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2477 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2477 instr->arguments_count(), | 2478 instr->arguments_count(), |
2478 instr->function(), | 2479 instr->function(), |
2479 undefined, | 2480 undefined, |
2480 instr->inlining_kind()); | 2481 instr->inlining_kind()); |
2481 // Only replay binding of arguments object if it wasn't removed from graph. | 2482 // Only replay binding of arguments object if it wasn't removed from graph. |
2482 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { | 2483 if (instr->arguments_var() != NULL && instr->arguments_object()->IsLinked()) { |
2483 inner->Bind(instr->arguments_var(), instr->arguments_object()); | 2484 inner->Bind(instr->arguments_var(), instr->arguments_object()); |
2484 } | 2485 } |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2532 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { | 2533 LInstruction* LChunkBuilder::DoLoadFieldByIndex(HLoadFieldByIndex* instr) { |
2533 LOperand* object = UseRegister(instr->object()); | 2534 LOperand* object = UseRegister(instr->object()); |
2534 LOperand* index = UseRegister(instr->index()); | 2535 LOperand* index = UseRegister(instr->index()); |
2535 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); | 2536 LLoadFieldByIndex* load = new(zone()) LLoadFieldByIndex(object, index); |
2536 LInstruction* result = DefineSameAsFirst(load); | 2537 LInstruction* result = DefineSameAsFirst(load); |
2537 return AssignPointerMap(result); | 2538 return AssignPointerMap(result); |
2538 } | 2539 } |
2539 | 2540 |
2540 | 2541 |
2541 } } // namespace v8::internal | 2542 } } // namespace v8::internal |
OLD | NEW |