src/x64/deoptimizer-x64.cc - Issue 11441013: Fix isolate bug introduced by generated code stubs

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/x64/deoptimizer-x64.cc

Issue 11441013: Fix isolate bug introduced by generated code stubs (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Correct structness Created 8 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/x64/deoptimizer-x64.cc

diff --git a/src/x64/deoptimizer-x64.cc b/src/x64/deoptimizer-x64.cc

index 2cdd3f0d27afb499bd9e8bc34969d5103474cec5..20f507bdfbf65e75bbfec19b5e8fb3939967d0e7 100644

--- a/src/x64/deoptimizer-x64.cc

+++ b/src/x64/deoptimizer-x64.cc

@@ -491,8 +491,8 @@ void Deoptimizer::DoCompiledStubFrame(TranslationIterator* iterator,

ASSERT(compiled_code_->kind() == Code::COMPILED_STUB);

int major_key = compiled_code_->major_key();

CodeStubInterfaceDescriptor* descriptor =

- isolate_->code_stub_interface_descriptors()[major_key];

- Handle<Code> miss_ic(descriptor->deoptimization_handler);

+ isolate_->code_stub_interface_descriptor(major_key);

+ Handle<Code> miss_ic(descriptor->deoptimization_handler_);

output_frame->SetPc(reinterpret_cast<intptr_t>(miss_ic->instruction_start()));

unsigned input_frame_size = input_->GetFrameSize();

intptr_t value = input_->GetFrameSlot(input_frame_size - kPointerSize);