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 2184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2195 set_deoptimization_environment(result->environment()); | 2195 set_deoptimization_environment(result->environment()); |
2196 ClearInstructionPendingDeoptimizationEnvironment(); | 2196 ClearInstructionPendingDeoptimizationEnvironment(); |
2197 return result; | 2197 return result; |
2198 } | 2198 } |
2199 | 2199 |
2200 return NULL; | 2200 return NULL; |
2201 } | 2201 } |
2202 | 2202 |
2203 | 2203 |
2204 LInstruction* LChunkBuilder::DoStackCheck(HStackCheck* instr) { | 2204 LInstruction* LChunkBuilder::DoStackCheck(HStackCheck* instr) { |
2205 return AssignEnvironment(AssignPointerMap(new LStackCheck)); | 2205 if (instr->is_function_entry()) { |
| 2206 return MarkAsCall(new LStackCheck, instr); |
| 2207 } else { |
| 2208 ASSERT(instr->is_backwards_branch()); |
| 2209 return AssignEnvironment(AssignPointerMap(new LStackCheck)); |
| 2210 } |
2206 } | 2211 } |
2207 | 2212 |
2208 | 2213 |
2209 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { | 2214 LInstruction* LChunkBuilder::DoEnterInlined(HEnterInlined* instr) { |
2210 HEnvironment* outer = current_block_->last_environment(); | 2215 HEnvironment* outer = current_block_->last_environment(); |
2211 HConstant* undefined = graph()->GetConstantUndefined(); | 2216 HConstant* undefined = graph()->GetConstantUndefined(); |
2212 HEnvironment* inner = outer->CopyForInlining(instr->closure(), | 2217 HEnvironment* inner = outer->CopyForInlining(instr->closure(), |
2213 instr->function(), | 2218 instr->function(), |
2214 undefined, | 2219 undefined, |
2215 instr->call_kind()); | 2220 instr->call_kind()); |
(...skipping 12 matching lines...) Expand all Loading... |
2228 | 2233 |
2229 LInstruction* LChunkBuilder::DoIn(HIn* instr) { | 2234 LInstruction* LChunkBuilder::DoIn(HIn* instr) { |
2230 LOperand* key = UseRegisterAtStart(instr->key()); | 2235 LOperand* key = UseRegisterAtStart(instr->key()); |
2231 LOperand* object = UseRegisterAtStart(instr->object()); | 2236 LOperand* object = UseRegisterAtStart(instr->object()); |
2232 LIn* result = new LIn(key, object); | 2237 LIn* result = new LIn(key, object); |
2233 return MarkAsCall(DefineFixed(result, r0), instr); | 2238 return MarkAsCall(DefineFixed(result, r0), instr); |
2234 } | 2239 } |
2235 | 2240 |
2236 | 2241 |
2237 } } // namespace v8::internal | 2242 } } // namespace v8::internal |
OLD | NEW |