src/ia32/deoptimizer-ia32.cc - Issue 6532091: Merge bleeding_edge revision (5922, 5934] to isolates branch....

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/ia32/deoptimizer-ia32.cc

Issue 6532091: Merge bleeding_edge revision (5922, 5934] to isolates branch.... (Closed) Base URL: http://v8.googlecode.com/svn/branches/experimental/isolates/

Patch Set: '' Created 9 years, 10 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/ia32/deoptimizer-ia32.cc

===================================================================

--- src/ia32/deoptimizer-ia32.cc (revision 6894)

+++ src/ia32/deoptimizer-ia32.cc (working copy)

@@ -354,7 +354,7 @@

// function code and AST id of the bailout.

output_offset -= kPointerSize;

input_offset -= kPointerSize;

- uint32_t value;

+ intptr_t value;

if (is_bottommost) {

value = input_->GetFrameSlot(input_offset);

} else {

@@ -378,7 +378,7 @@

value = output_[frame_index - 1]->GetFp();

}

output_frame->SetFrameSlot(output_offset, value);

- unsigned fp_value = top_address + output_offset;

+ intptr_t fp_value = top_address + output_offset;

ASSERT(!is_bottommost || input_->GetRegister(ebp.code()) == fp_value);

output_frame->SetFp(fp_value);

if (is_topmost) output_frame->SetRegister(ebp.code(), fp_value);

« no previous file with comments | « src/hydrogen.cc ('k') | src/log.h » ('j') | no next file with comments »