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 2162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2173 return MarkAsCall(new LStackCheck, instr); | 2173 return MarkAsCall(new LStackCheck, instr); |
2174 } | 2174 } |
2175 | 2175 |
2176 | 2176 |
2177 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2177 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2178 HEnvironment* outer = current_block_->last_environment(); | 2178 HEnvironment* outer = current_block_->last_environment(); |
2179 HConstant* undefined = graph()->GetConstantUndefined(); | 2179 HConstant* undefined = graph()->GetConstantUndefined(); |
2180 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2180 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2181 instr->function(), | 2181 instr->function(), |
2182 HEnvironment::LITHIUM, | 2182 HEnvironment::LITHIUM, |
2183 undefined); | 2183 undefined, |
| 2184 instr->call_kind()); |
2184 current_block_->UpdateEnvironment(inner); | 2185 current_block_->UpdateEnvironment(inner); |
2185 chunk_->AddInlinedClosure(instr->closure()); | 2186 chunk_->AddInlinedClosure(instr->closure()); |
2186 return NULL; | 2187 return NULL; |
2187 } | 2188 } |
2188 | 2189 |
2189 | 2190 |
2190 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { | 2191 LInstruction* LChunkBuilder::DoLeaveInlined(HLeaveInlined* instr) { |
2191 HEnvironment* outer = current_block_->last_environment()->outer(); | 2192 HEnvironment* outer = current_block_->last_environment()->outer(); |
2192 current_block_->UpdateEnvironment(outer); | 2193 current_block_->UpdateEnvironment(outer); |
2193 return NULL; | 2194 return NULL; |
2194 } | 2195 } |
2195 | 2196 |
2196 | 2197 |
2197 LInstruction* LChunkBuilder::DoIn(HIn* instr) { | 2198 LInstruction* LChunkBuilder::DoIn(HIn* instr) { |
2198 LOperand* key = UseRegisterAtStart(instr->key()); | 2199 LOperand* key = UseRegisterAtStart(instr->key()); |
2199 LOperand* object = UseRegisterAtStart(instr->object()); | 2200 LOperand* object = UseRegisterAtStart(instr->object()); |
2200 LIn* result = new LIn(key, object); | 2201 LIn* result = new LIn(key, object); |
2201 return MarkAsCall(DefineFixed(result, r0), instr); | 2202 return MarkAsCall(DefineFixed(result, r0), instr); |
2202 } | 2203 } |
2203 | 2204 |
2204 | 2205 |
2205 } } // namespace v8::internal | 2206 } } // namespace v8::internal |
OLD | NEW |