| Index: src/x64/deoptimizer-x64.cc
|
| diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc
|
| index b1c4274d145cd60c4ecee4cbb83c9e1e57e1ce0b..e1b1678a297e78efc481ea55c32eaee597a854fb 100644
|
| --- a/src/x64/deoptimizer-x64.cc
|
| +++ b/src/x64/deoptimizer-x64.cc
|
| @@ -187,7 +187,7 @@ void Deoptimizer::DeoptimizeFunction(JSFunction* function) {
|
|
|
| // Add the deoptimizing code to the list.
|
| DeoptimizingCodeListNode* node = new DeoptimizingCodeListNode(code);
|
| - DeoptimizerData* data = Isolate::Current()->deoptimizer_data();
|
| + DeoptimizerData* data = code->GetIsolate()->deoptimizer_data();
|
| node->set_next(data->deoptimizing_code_list_);
|
| data->deoptimizing_code_list_ = node;
|
|
|
| @@ -389,8 +389,8 @@ void Deoptimizer::DoComputeOsrOutputFrame() {
|
| optimized_code_->entry() + pc_offset);
|
| output_[0]->SetPc(pc);
|
| }
|
| - Code* continuation = Isolate::Current()->builtins()->builtin(
|
| - Builtins::NotifyOSR);
|
| + Code* continuation =
|
| + function->GetIsolate()->builtins()->builtin(Builtins::kNotifyOSR);
|
| output_[0]->SetContinuation(
|
| reinterpret_cast<intptr_t>(continuation->entry()));
|
|
|
| @@ -562,9 +562,8 @@ void Deoptimizer::DoComputeFrame(TranslationIterator* iterator,
|
| // Set the continuation for the topmost frame.
|
| if (is_topmost) {
|
| Code* continuation = (bailout_type_ == EAGER)
|
| - ? Isolate::Current()->builtins()->builtin(Builtins::NotifyDeoptimized)
|
| - : Isolate::Current()->builtins()->builtin(
|
| - Builtins::NotifyLazyDeoptimized);
|
| + ? isolate_->builtins()->builtin(Builtins::kNotifyDeoptimized)
|
| + : isolate_->builtins()->builtin(Builtins::kNotifyLazyDeoptimized);
|
| output_frame->SetContinuation(
|
| reinterpret_cast<intptr_t>(continuation->entry()));
|
| }
|
|
|