| OLD | NEW |
| 1 // Copyright 2013 the V8 project authors. All rights reserved. | 1 // Copyright 2013 the V8 project authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "src/compiler/code-generator.h" | 5 #include "src/compiler/code-generator.h" |
| 6 | 6 |
| 7 #include "src/address-map.h" | 7 #include "src/address-map.h" |
| 8 #include "src/compiler/code-generator-impl.h" | 8 #include "src/compiler/code-generator-impl.h" |
| 9 #include "src/compiler/linkage.h" | 9 #include "src/compiler/linkage.h" |
| 10 #include "src/compiler/pipeline.h" | 10 #include "src/compiler/pipeline.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 } else if (operand.IsRegister() && (kind & Safepoint::kWithRegisters)) { | 267 } else if (operand.IsRegister() && (kind & Safepoint::kWithRegisters)) { |
| 268 Register reg = LocationOperand::cast(operand).GetRegister(); | 268 Register reg = LocationOperand::cast(operand).GetRegister(); |
| 269 safepoint.DefinePointerRegister(reg, zone()); | 269 safepoint.DefinePointerRegister(reg, zone()); |
| 270 } | 270 } |
| 271 } | 271 } |
| 272 } | 272 } |
| 273 | 273 |
| 274 bool CodeGenerator::IsMaterializableFromFrame(Handle<HeapObject> object, | 274 bool CodeGenerator::IsMaterializableFromFrame(Handle<HeapObject> object, |
| 275 int* slot_return) { | 275 int* slot_return) { |
| 276 if (linkage()->GetIncomingDescriptor()->IsJSFunctionCall()) { | 276 if (linkage()->GetIncomingDescriptor()->IsJSFunctionCall()) { |
| 277 if (info()->has_context() && object.is_identical_to(info()->context()) && | 277 if (object.is_identical_to(info()->context()) && !info()->is_osr()) { |
| 278 !info()->is_osr()) { | |
| 279 *slot_return = Frame::kContextSlot; | 278 *slot_return = Frame::kContextSlot; |
| 280 return true; | 279 return true; |
| 281 } else if (object.is_identical_to(info()->closure())) { | 280 } else if (object.is_identical_to(info()->closure())) { |
| 282 *slot_return = Frame::kJSFunctionSlot; | 281 *slot_return = Frame::kJSFunctionSlot; |
| 283 return true; | 282 return true; |
| 284 } | 283 } |
| 285 } | 284 } |
| 286 return false; | 285 return false; |
| 287 } | 286 } |
| 288 | 287 |
| (...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 802 : frame_(gen->frame()), masm_(gen->masm()), next_(gen->ools_) { | 801 : frame_(gen->frame()), masm_(gen->masm()), next_(gen->ools_) { |
| 803 gen->ools_ = this; | 802 gen->ools_ = this; |
| 804 } | 803 } |
| 805 | 804 |
| 806 | 805 |
| 807 OutOfLineCode::~OutOfLineCode() {} | 806 OutOfLineCode::~OutOfLineCode() {} |
| 808 | 807 |
| 809 } // namespace compiler | 808 } // namespace compiler |
| 810 } // namespace internal | 809 } // namespace internal |
| 811 } // namespace v8 | 810 } // namespace v8 |
| OLD | NEW |