| Index: src/compiler/code-generator.cc
|
| diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc
|
| index 8d4baa3145a3ce0fef9eaa409c861f91c5cf8e51..2903c3d370dd825fd2f864f7d9186fed3d6da891 100644
|
| --- a/src/compiler/code-generator.cc
|
| +++ b/src/compiler/code-generator.cc
|
| @@ -231,7 +231,7 @@ void CodeGenerator::RecordSafepoint(ReferenceMap* references,
|
| bool CodeGenerator::IsMaterializableFromFrame(Handle<HeapObject> object,
|
| int* offset_return) {
|
| if (linkage()->GetIncomingDescriptor()->IsJSFunctionCall()) {
|
| - if (object.is_identical_to(info()->context())) {
|
| + if (object.is_identical_to(info()->context()) && !info()->is_osr()) {
|
| *offset_return = StandardFrameConstants::kContextOffset;
|
| return true;
|
| } else if (object.is_identical_to(info()->closure())) {
|
|
|