| OLD | NEW |
| 1 // Copyright 2011 the V8 project authors. All rights reserved. | 1 // Copyright 2011 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 2050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2061 env->Drop(instr->pop_count()); | 2061 env->Drop(instr->pop_count()); |
| 2062 for (int i = 0; i < instr->values()->length(); ++i) { | 2062 for (int i = 0; i < instr->values()->length(); ++i) { |
| 2063 HValue* value = instr->values()->at(i); | 2063 HValue* value = instr->values()->at(i); |
| 2064 if (instr->HasAssignedIndexAt(i)) { | 2064 if (instr->HasAssignedIndexAt(i)) { |
| 2065 env->Bind(instr->GetAssignedIndexAt(i), value); | 2065 env->Bind(instr->GetAssignedIndexAt(i), value); |
| 2066 } else { | 2066 } else { |
| 2067 env->Push(value); | 2067 env->Push(value); |
| 2068 } | 2068 } |
| 2069 } | 2069 } |
| 2070 | 2070 |
| 2071 ASSERT(env->length() == instr->environment_length()); | |
| 2072 | |
| 2073 // If there is an instruction pending deoptimization environment create a | 2071 // If there is an instruction pending deoptimization environment create a |
| 2074 // lazy bailout instruction to capture the environment. | 2072 // lazy bailout instruction to capture the environment. |
| 2075 if (pending_deoptimization_ast_id_ == instr->ast_id()) { | 2073 if (pending_deoptimization_ast_id_ == instr->ast_id()) { |
| 2076 LInstruction* result = new LLazyBailout; | 2074 LInstruction* result = new LLazyBailout; |
| 2077 result = AssignEnvironment(result); | 2075 result = AssignEnvironment(result); |
| 2078 instruction_pending_deoptimization_environment_-> | 2076 instruction_pending_deoptimization_environment_-> |
| 2079 set_deoptimization_environment(result->environment()); | 2077 set_deoptimization_environment(result->environment()); |
| 2080 ClearInstructionPendingDeoptimizationEnvironment(); | 2078 ClearInstructionPendingDeoptimizationEnvironment(); |
| 2081 return result; | 2079 return result; |
| 2082 } | 2080 } |
| (...skipping 21 matching lines...) Expand all Loading... |
| 2104 | 2102 |
| 2105 | 2103 |
| 2106 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2104 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
| 2107 HEnvironment* outer = current_block_->last_environment()->outer(); | 2105 HEnvironment* outer = current_block_->last_environment()->outer(); |
| 2108 current_block_->UpdateEnvironment(outer); | 2106 current_block_->UpdateEnvironment(outer); |
| 2109 return NULL; | 2107 return NULL; |
| 2110 } | 2108 } |
| 2111 | 2109 |
| 2112 | 2110 |
| 2113 } } // namespace v8::internal | 2111 } } // namespace v8::internal |
| OLD | NEW |