Chromium Code Reviews| Index: src/compiler/code-generator.cc |
| diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc |
| index 4f0b0390442d87dc8ba4f7a2446c502116ce68ed..203a9962d592e770c6a2ad8bcd7b94e2db6c6158 100644 |
| --- a/src/compiler/code-generator.cc |
| +++ b/src/compiler/code-generator.cc |
| @@ -232,7 +232,8 @@ 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()) && !info()->is_osr()) { |
| + if (info()->has_context() && object.is_identical_to(info()->context()) && |
| + !info()->is_osr()) { |
| *offset_return = StandardFrameConstants::kContextOffset; |
| return true; |
| } else if (object.is_identical_to(info()->closure())) { |
| @@ -531,6 +532,7 @@ void CodeGenerator::BuildTranslationForFrameStateDescriptor( |
| Handle<SharedFunctionInfo> shared_info; |
| if (!descriptor->shared_info().ToHandle(&shared_info)) { |
| + if (!info()->parse_info()) return; // TODO(titzer): that was unfortunate. |
|
Michael Starzinger
2015/08/14 11:52:38
nit: Can we use has_shared_info() here instead? We
|
| shared_info = info()->shared_info(); |
| } |
| int shared_info_id = DefineDeoptimizationLiteral(shared_info); |