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/compiler/code-generator-impl.h" | 7 #include "src/compiler/code-generator-impl.h" |
8 #include "src/compiler/linkage.h" | 8 #include "src/compiler/linkage.h" |
9 #include "src/compiler/pipeline.h" | 9 #include "src/compiler/pipeline.h" |
10 #include "src/snapshot/serialize.h" // TODO(turbofan): RootIndexMap | 10 #include "src/snapshot/serialize.h" // TODO(turbofan): RootIndexMap |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
224 Register::FromAllocationIndex(RegisterOperand::cast(operand).index()); | 224 Register::FromAllocationIndex(RegisterOperand::cast(operand).index()); |
225 safepoint.DefinePointerRegister(reg, zone()); | 225 safepoint.DefinePointerRegister(reg, zone()); |
226 } | 226 } |
227 } | 227 } |
228 } | 228 } |
229 | 229 |
230 | 230 |
231 bool CodeGenerator::IsMaterializableFromFrame(Handle<HeapObject> object, | 231 bool CodeGenerator::IsMaterializableFromFrame(Handle<HeapObject> object, |
232 int* offset_return) { | 232 int* offset_return) { |
233 if (linkage()->GetIncomingDescriptor()->IsJSFunctionCall()) { | 233 if (linkage()->GetIncomingDescriptor()->IsJSFunctionCall()) { |
234 if (object.is_identical_to(info()->context())) { | 234 if (object.is_identical_to(info()->context()) && !info()->is_osr()) { |
235 *offset_return = StandardFrameConstants::kContextOffset; | 235 *offset_return = StandardFrameConstants::kContextOffset; |
236 return true; | 236 return true; |
237 } else if (object.is_identical_to(info()->closure())) { | 237 } else if (object.is_identical_to(info()->closure())) { |
238 *offset_return = JavaScriptFrameConstants::kFunctionOffset; | 238 *offset_return = JavaScriptFrameConstants::kFunctionOffset; |
239 return true; | 239 return true; |
240 } | 240 } |
241 } | 241 } |
242 return false; | 242 return false; |
243 } | 243 } |
244 | 244 |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 : masm_(gen->masm()), next_(gen->ools_) { | 712 : masm_(gen->masm()), next_(gen->ools_) { |
713 gen->ools_ = this; | 713 gen->ools_ = this; |
714 } | 714 } |
715 | 715 |
716 | 716 |
717 OutOfLineCode::~OutOfLineCode() {} | 717 OutOfLineCode::~OutOfLineCode() {} |
718 | 718 |
719 } // namespace compiler | 719 } // namespace compiler |
720 } // namespace internal | 720 } // namespace internal |
721 } // namespace v8 | 721 } // namespace v8 |
OLD | NEW |