| Index: src/runtime/runtime-compiler.cc
|
| diff --git a/src/runtime/runtime-compiler.cc b/src/runtime/runtime-compiler.cc
|
| index be866ad935f2224e2032b760d35a91b46e2ddda3..15a3a14156f138e2c87349bcf2eeaea84db76f43 100644
|
| --- a/src/runtime/runtime-compiler.cc
|
| +++ b/src/runtime/runtime-compiler.cc
|
| @@ -151,6 +151,11 @@ RUNTIME_FUNCTION(Runtime_NotifyDeoptimized) {
|
| RUNTIME_ASSERT(frame->function()->IsJSFunction());
|
| DCHECK(frame->function() == *function);
|
|
|
| + // Ensure the context register is updated for materialized objects.
|
| + JavaScriptFrameIterator top_it(isolate);
|
| + JavaScriptFrame* top_frame = top_it.frame();
|
| + isolate->set_context(Context::cast(top_frame->context()));
|
| +
|
| if (type == Deoptimizer::LAZY) {
|
| return isolate->heap()->undefined_value();
|
| }
|
|
|